--- /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 @@
-control->tpl['js_checkVatPopup']) {
- echo $this->control->tpl['js_checkVatPopup'];
-} ?>
+control->tpl['js_checkVatPopup']) echo $this->control->tpl['js_checkVatPopup']; ?>
@@ -64,4 +63,4 @@
-
-
trans('Prefix'); ?> |
- |
-
+ global->SOCIETE_USEPREFIX)) { ?>
+ trans('Prefix'); ?> |
+ |
+
@@ -74,2 +73,2 @@
- trans('CustomerCode'); ?> |
-
+ | trans('CustomerCode'); ?> |
+
@@ -78 +77 @@
- | |
+ |
@@ -89,8 +88,8 @@
- trans('SupplierCode'); ?> |
-
-
+ | trans('SupplierCode'); ?> |
+
+
@@ -108 +107 @@
-if (isModEnabled('barcode')) { ?>
+if (!empty($conf->barcode->enabled)) { ?>
@@ -159,3 +158 @@
- if ($i == 1 || $i == 3) {
- echo ' | ';
- }
+ if ($i == 1 || $i == 3) echo '
';
@@ -164,3 +161 @@
- if ($i == 2 || $i == 4) {
- echo '
';
- }
+ if ($i == 2 || $i == 4) echo '';
@@ -168,3 +163 @@
- if ($i == 1 || $i == 3) {
- echo '';
- }
+ if ($i == 1 || $i == 3) echo '
';
@@ -173,3 +166 @@
- if ($i == 2 || $i == 4) {
- echo '
';
- }
+ if ($i == 2 || $i == 4) echo '';
@@ -192 +183 @@
-
+global->MAIN_MULTILANGS)) { ?>
@@ -206,5 +197,3 @@
-control->tpl['localtax'])) {
- echo $this->control->tpl['localtax'];
-} ?>
-
-hasRight('societe', 'client', 'voir')) { ?>
+control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
+
+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 @@
-control->tpl['js_checkVatPopup']) {
- echo $this->control->tpl['js_checkVatPopup'];
-} ?>
+control->tpl['js_checkVatPopup']) echo $this->control->tpl['js_checkVatPopup']; ?>
@@ -56 +55 @@
-
+global->SOCIETE_USEPREFIX)) { ?>
@@ -79 +78 @@
-
+
@@ -100 +99 @@
-
+
@@ -120 +119 @@
- }
+ }
@@ -123 +122 @@
-if (isModEnabled('barcode')) { ?>
+if (!empty($conf->barcode->enabled)) { ?>
@@ -169,3 +168 @@
- if ($i == 1 || $i == 3) {
- echo '';
- }
+ if ($i == 1 || $i == 3) echo '
';
@@ -174,3 +171 @@
- if ($i == 2 || $i == 4) {
- echo '
';
- }
+ if ($i == 2 || $i == 4) echo '';
@@ -178,3 +173 @@
- if ($i == 1 || $i == 3) {
- echo '';
- }
+ if ($i == 1 || $i == 3) echo '
';
@@ -183,3 +176 @@
- if ($i == 2 || $i == 4) {
- echo '
';
- }
+ if ($i == 2 || $i == 4) echo '';
@@ -214 +205 @@
-
+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 @@
-">
+">
@@ -231 +220 @@
-">
+">
--- /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');
-
-?>
-
-control->tpl['error']) {
- echo $this->control->tpl['error'];
-} ?>
-control->tpl['action_delete']) {
- echo $this->control->tpl['action_delete'];
-} ?>
-control->tpl['js_checkVatPopup']) {
- echo $this->control->tpl['js_checkVatPopup'];
-} ?>
+dol_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company');
+
+?>
+
+control->tpl['error']) echo $this->control->tpl['error']; ?>
+control->tpl['action_delete']) echo $this->control->tpl['action_delete']; ?>
+control->tpl['js_checkVatPopup']) echo $this->control->tpl['js_checkVatPopup']; ?>
@@ -53 +48 @@
-
+global->SOCIETE_USEPREFIX)) { ?>
@@ -64,2 +59,2 @@
- control->tpl['checkcustomercode'] != 0) { ?>
- (trans("WrongCustomerCode"); ?>)
+ control->tpl['checkcustomercode'] <> 0) { ?>
+ (trans("WrongCustomerCode"); ?>)
@@ -75,2 +70,2 @@
- control->tpl['checksuppliercode'] != 0) { ?>
- (trans("WrongSupplierCode"); ?>)
+ control->tpl['checksuppliercode'] <> 0) { ?>
+ (trans("WrongSupplierCode"); ?>)
@@ -82 +77 @@
-
+barcode->enabled)) { ?>
@@ -128,3 +123 @@
- if ($i == 1 || $i == 3) {
- echo '';
- }
+ if ($i == 1 || $i == 3) echo '
';
@@ -134,5 +127,2 @@
- if ($this->control->tpl['checkprofid'.$i] > 0) {
- echo ' '.$this->control->tpl['urlprofid'.$i];
- } else {
- echo ' ('.$langs->trans("ErrorWrongValue").')';
- }
+ if ($this->control->tpl['checkprofid'.$i] > 0) echo ' '.$this->control->tpl['urlprofid'.$i];
+ else echo ' ('.$langs->trans("ErrorWrongValue").')';
@@ -141,3 +131 @@
- if ($i == 2 || $i == 4) {
- echo '
';
- }
+ if ($i == 2 || $i == 4) echo '';
@@ -145,3 +133 @@
- if ($i == 1 || $i == 3) {
- echo '';
- }
+ if ($i == 1 || $i == 3) echo '
';
@@ -150,3 +136 @@
- if ($i == 2 || $i == 4) {
- echo '
';
- }
+ if ($i == 2 || $i == 4) echo '';
@@ -164,3 +148 @@
-control->tpl['localtax'])) {
- echo $this->control->tpl['localtax'];
-} ?>
+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 ' ';
- }
+ if ($this->control->tpl['capital']) echo $this->control->tpl['capital'].' '.$langs->trans("Currency".$conf->currency);
+ else echo ' ';
@@ -193 +172 @@
-
+global->MAIN_MULTILANGS)) { ?>
@@ -206 +185 @@
- hasRight('societe', 'creer')) { ?>
+ rights->societe->creer) { ?>
@@ -238 +217 @@
- hasRight('societe', 'creer')) { ?>
+ rights->societe->creer) { ?>
@@ -250 +229 @@
-
+adherent->enabled)) { ?>
@@ -259 +238 @@
-
+
@@ -262,5 +241,5 @@
-hasRight('societe', 'creer')) { ?>
-control->tpl['id'].'&action=edit&token='.newToken().'&canvas='.urlencode($canvas); ?>">trans("Modify"); ?>
-
-
-hasRight('societe', 'supprimer')) { ?>
+rights->societe->creer) { ?>
+control->tpl['id'].'&action=edit&canvas='.$canvas; ?>">trans("Modify"); ?>
+
+
+rights->societe->supprimer) { ?>
@@ -270 +249 @@
- control->tpl['id'].'&action=delete&token='.newToken().'&canvas='.urlencode($canvas); ?>">trans('Delete'); ?>
+ control->tpl['id'].'&action=delete&canvas='.$canvas; ?>">trans('Delete'); ?>
@@ -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;