--- /tmp/dsg/dolibarr/htdocs/contact/canvas/default/tpl/github_19.0.3_contactcard_edit.tpl.php +++ /tmp/dsg/dolibarr/htdocs/contact/canvas/default/tpl/client_contactcard_edit.tpl.php @@ -19 +19,2 @@ -if (empty($conf) || !is_object($conf)) { +if (empty($conf) || !is_object($conf)) +{ @@ -42 +43 @@ - + @@ -79 +80 @@ - + @@ -118 +119 @@ - + @@ -154,2 +155,2 @@ - ">  - "> + ">  + "> --- /tmp/dsg/dolibarr/htdocs/contact/canvas/default/tpl/github_19.0.3_contactcard_view.tpl.php +++ /tmp/dsg/dolibarr/htdocs/contact/canvas/default/tpl/client_contactcard_view.tpl.php @@ -19 +19,2 @@ -if (empty($conf) || !is_object($conf)) { +if (empty($conf) || !is_object($conf)) +{ @@ -32,6 +33,2 @@ -if (!empty($this->control->tpl['action_create_user'])) { - echo $this->control->tpl['action_create_user']; -} -if (!empty($this->control->tpl['action_delete'])) { - echo $this->control->tpl['action_delete']; -} ?> +if (!empty($this->control->tpl['action_create_user'])) echo $this->control->tpl['action_create_user']; +if (!empty($this->control->tpl['action_delete'])) echo $this->control->tpl['action_delete']; ?> @@ -141,2 +138,2 @@ - if ($user->hasRight('societe', 'contact', 'creer')) { - print ''.$langs->trans('Modify').''; + if ($user->rights->societe->contact->creer) { + print ''.$langs->trans('Modify').''; @@ -145,2 +142,2 @@ - if (!$this->control->tpl['user_id'] && $user->hasRight('user', 'user', 'creer')) { - print ''.$langs->trans("CreateDolibarrLogin").''; + if (!$this->control->tpl['user_id'] && $user->rights->user->user->creer) { + print ''.$langs->trans("CreateDolibarrLogin").''; @@ -149,2 +146,2 @@ - if ($user->hasRight('societe', 'contact', 'supprimer')) { - print ''.$langs->trans('Delete').''; + if ($user->rights->societe->contact->supprimer) { + print ''.$langs->trans('Delete').'';