From 3e27fb9d974673f6b87744bbf19d052973e946cd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 26 Jan 2011 19:41:51 +0000 Subject: [PATCH] Fix: Hide if supplier module is disabled --- htdocs/societe/soc.php | 83 ++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 40 deletions(-) diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index eedd848693ff3..d388e71267080 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -1103,49 +1103,52 @@ print ''; // Supplier - print ''; - print ''.$langs->trans('Supplier').''; - print $form->selectyesno("fournisseur",$soc->fournisseur,1); - print ''; - print ''.$langs->trans('SupplierCode').''; - - print '
'; - if ((!$soc->code_fournisseur || $soc->code_fournisseur == -1) && $modCodeFournisseur->code_auto) + if ($conf->fournisseur->enabled) { - $tmpcode=$soc->code_fournisseur; - if (empty($tmpcode) && $modCodeFournisseur->code_auto) $tmpcode=$modCodeFournisseur->getNextValue($soc,1); - print ''; - } - else if ($soc->codefournisseur_modifiable()) - { - print ''; - } - else - { - print $soc->code_fournisseur; - print ''; - } - print ''; - $s=$modCodeFournisseur->getToolTip($langs,$soc,1); - print $form->textwithpicto('',$s,1); - print '
'; + print ''; + print ''.$langs->trans('Supplier').''; + print $form->selectyesno("fournisseur",$soc->fournisseur,1); + print ''; + print ''.$langs->trans('SupplierCode').''; + + print '
'; + if ((!$soc->code_fournisseur || $soc->code_fournisseur == -1) && $modCodeFournisseur->code_auto) + { + $tmpcode=$soc->code_fournisseur; + if (empty($tmpcode) && $modCodeFournisseur->code_auto) $tmpcode=$modCodeFournisseur->getNextValue($soc,1); + print ''; + } + else if ($soc->codefournisseur_modifiable()) + { + print ''; + } + else + { + print $soc->code_fournisseur; + print ''; + } + print ''; + $s=$modCodeFournisseur->getToolTip($langs,$soc,1); + print $form->textwithpicto('',$s,1); + print '
'; - print ''; + print ''; - // Category - if ($soc->fournisseur) - { - $load = $soc->LoadSupplierCateg(); - if ( $load == 0) - { - if (sizeof($soc->SupplierCategories) > 0) - { - print ''; - print ''.$langs->trans('SupplierCategory').''; - print $form->selectarray("fournisseur_categorie",$soc->SupplierCategories,'',1); - print ''; - } - } + // Category + if ($conf->categorie->enabled && $soc->fournisseur) + { + $load = $soc->LoadSupplierCateg(); + if ( $load == 0) + { + if (sizeof($soc->SupplierCategories) > 0) + { + print ''; + print ''.$langs->trans('SupplierCategory').''; + print $form->selectarray("fournisseur_categorie",$soc->SupplierCategories,'',1); + print ''; + } + } + } } if ($conf->global->MAIN_MODULE_BARCODE)