diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 56a4e4cc754..0f9d67113fd 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -1591,9 +1591,6 @@ print '
';
if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
{
- require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
- $formcompany= new FormCompany($db);
-
$blocname = 'contacts';
$title = $langs->trans('ContactsAddresses');
include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index 2d348b131e8..641fcbce1ae 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -1260,9 +1260,9 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
}
}
- if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+ if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->commande->creer)
{
- if ($action == 'addcontact' && $user->rights->commande->creer)
+ if ($action == 'addcontact')
{
if ($object->id > 0)
{
@@ -1290,7 +1290,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
}
// bascule du statut d'un contact
- else if ($action == 'swapstatut' && $user->rights->commande->creer)
+ else if ($action == 'swapstatut')
{
if ($object->id > 0)
{
@@ -1303,7 +1303,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
}
// Efface un contact
- else if ($action == 'deletecontact' && $user->rights->commande->creer)
+ else if ($action == 'deletecontact')
{
$result = $object->delete_contact($lineid);
@@ -2101,9 +2101,6 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
{
- require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
- $formcompany= new FormCompany($db);
-
$blocname = 'contacts';
$title = $langs->trans('ContactsAddresses');
include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 47ccaa16292..1d230ad7406 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1629,9 +1629,9 @@ else if ($action == 'remove_file')
}
}
-if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->facture->creer)
{
- if ($action == 'addcontact' && $user->rights->facture->creer)
+ if ($action == 'addcontact')
{
$result = $object->fetch($id);
@@ -1661,7 +1661,7 @@ if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
}
// bascule du statut d'un contact
- else if ($action == 'swapstatut' && $user->rights->facture->creer)
+ else if ($action == 'swapstatut')
{
if ($object->fetch($id))
{
@@ -1674,7 +1674,7 @@ if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
}
// Efface un contact
- else if ($action == 'deletecontact' && $user->rights->facture->creer)
+ else if ($action == 'deletecontact')
{
$object->fetch($id);
$result = $object->delete_contact($lineid);
@@ -2980,10 +2980,6 @@ else if ($id > 0 || ! empty($ref))
if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
{
- require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
- require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
- $formcompany= new FormCompany($db);
-
$blocname = 'contacts';
$title = $langs->trans('ContactsAddresses');
include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php
index 40bf8d84396..d980a8fac2d 100644
--- a/htdocs/contrat/fiche.php
+++ b/htdocs/contrat/fiche.php
@@ -486,9 +486,9 @@ else if ($action == 'setnote' && $user->rights->contrat->creer)
if ($result < 0) dol_print_error($db,$object->error);
}
-if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->contrat->creer)
{
- if ($action == 'addcontact' && $user->rights->contrat->creer)
+ if ($action == 'addcontact')
{
$result = $object->fetch($id);
@@ -518,7 +518,7 @@ if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
}
// bascule du statut d'un contact
- else if ($action == 'swapstatut' && $user->rights->contrat->creer)
+ else if ($action == 'swapstatut')
{
if ($object->fetch($id))
{
@@ -531,7 +531,7 @@ if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
}
// Efface un contact
- else if ($action == 'deletecontact' && $user->rights->contrat->creer)
+ else if ($action == 'deletecontact')
{
$object->fetch($id);
$result = $object->delete_contact(GETPOST('lineid'));
@@ -814,9 +814,6 @@ else
if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
{
- require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
- $formcompany= new FormCompany($db);
-
$blocname = 'contacts';
$title = $langs->trans('ContactsAddresses');
include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
@@ -830,7 +827,7 @@ else
}
- $servicepos=(isset($_REQUEST["servicepos"])?$_REQUEST["servicepos"]:1);
+ $servicepos=(GETPOST('servicepos')?GETPOST('servicepos'):1); // FIXME : not used ?
$colorb='666666';
$arrayothercontracts=$object->getListOfContracts('others');
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index 2625a1ef23d..886a1d20b90 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -16,6 +16,13 @@
*
*/
+if (! class_exists('Contact')) {
+ require DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+}
+if (! class_exists('FormCompany')) {
+ require DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+}
+
$module = $object->element;
// Special cases
@@ -25,6 +32,7 @@ elseif ($module == 'invoice_supplier') { $permission=$user->rights->fournisseur-
elseif ($module == 'order_supplier') { $permission=$user->rights->fournisseur->commande->creer; }
elseif (! isset($permission)) { $permission=$user->rights->$module->creer; } // If already defined by caller page
+$formcompany= new FormCompany($db);
$companystatic=new Societe($db);
$contactstatic=new Contact($db);
$userstatic=new User($db);
diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php
index 4edf8a95091..7914a475f96 100644
--- a/htdocs/fichinter/fiche.php
+++ b/htdocs/fichinter/fiche.php
@@ -648,9 +648,9 @@ if ($action == 'send' && ! GETPOST('cancel','alpha') && (empty($conf->global->MA
$action='presend';
}
-if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->ficheinter->creer)
{
- if ($action == 'addcontact' && $user->rights->ficheinter->creer)
+ if ($action == 'addcontact')
{
$result = $object->fetch($id);
@@ -680,7 +680,7 @@ if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
}
// bascule du statut d'un contact
- else if ($action == 'swapstatut' && $user->rights->ficheinter->creer)
+ else if ($action == 'swapstatut')
{
if ($object->fetch($id))
{
@@ -693,7 +693,7 @@ if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
}
// Efface un contact
- else if ($action == 'deletecontact' && $user->rights->ficheinter->creer)
+ else if ($action == 'deletecontact')
{
$object->fetch($id);
$result = $object->delete_contact(GETPOST('lineid','int'));
@@ -957,10 +957,6 @@ else if ($id > 0 || ! empty($ref))
if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
{
- require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
- require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
- $formcompany= new FormCompany($db);
-
$blocname = 'contacts';
$title = $langs->trans('ContactsAddresses');
include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index 7c3db50683a..937e2156561 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -876,9 +876,9 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
}
}
-if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->fournisseur->commande->creer)
{
- if ($action == 'addcontact' && $user->rights->fournisseur->commande->creer)
+ if ($action == 'addcontact')
{
$result = $object->fetch($id);
@@ -908,7 +908,7 @@ if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
}
// bascule du statut d'un contact
- else if ($action == 'swapstatut' && $user->rights->fournisseur->commande->creer)
+ else if ($action == 'swapstatut')
{
if ($object->fetch($id))
{
@@ -921,7 +921,7 @@ if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
}
// Efface un contact
- else if ($action == 'deletecontact' && $user->rights->fournisseur->commande->creer)
+ else if ($action == 'deletecontact')
{
$object->fetch($id);
$result = $object->delete_contact($_GET["lineid"]);
@@ -1253,10 +1253,6 @@ if ($id > 0 || ! empty($ref))
if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
{
- require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
- require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
- $formcompany= new FormCompany($db);
-
$blocname = 'contacts';
$title = $langs->trans('ContactsAddresses');
include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index b21eeff9870..82839fc40e3 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -443,7 +443,7 @@ elseif ($action == 'update_line')
$localtax1tx= get_localtax($_POST['tauxtva'], 1, $object->thirdparty);
$localtax2tx= get_localtax($_POST['tauxtva'], 2, $object->thirdparty);
$remise_percent=GETPOST('remise_percent');
-
+
$result=$object->updateline(GETPOST('lineid'), $label, $pu, GETPOST('tauxtva'), $localtax1tx, $localtax2tx, GETPOST('qty'), GETPOST('idprod'), $price_base_type, 0, $type, $remise_percent);
if ($result >= 0)
{
@@ -500,7 +500,7 @@ elseif ($action == 'addline')
$localtax1tx= get_localtax($tauxtva, 1, $object->thirdparty);
$localtax2tx= get_localtax($tauxtva, 2, $object->thirdparty);
$remise_percent=GETPOST('remise_percent');
-
+
if (! $_POST['dp_desc'])
{
$mesg='