Fix: La liste des produits services ne doit pas s'afficher si les modules ne sont pas actifs
This commit is contained in:
Laurent Destailleur
parent
bc44a6370b
commit
39b992484f
@ -20,10 +20,20 @@
|
||||
* $Source$
|
||||
*
|
||||
*/
|
||||
|
||||
/*!
|
||||
\file htdocs/comm/prospect/prospect.php
|
||||
\ingroup prospect
|
||||
\brief Page de la liste des prospects
|
||||
\version $Revision$
|
||||
*/
|
||||
|
||||
require("./pre.inc.php");
|
||||
require("./propal_model_pdf.class.php");
|
||||
|
||||
$langs->load("propal");
|
||||
$langs->load("projects");
|
||||
$langs->load("companies");
|
||||
|
||||
|
||||
$user->getrights('propale');
|
||||
@ -39,7 +49,7 @@ if (defined("PROPALE_ADDON") && is_readable(DOL_DOCUMENT_ROOT ."/includes/module
|
||||
|
||||
llxHeader();
|
||||
|
||||
print_titre("Nouvelle proposition commerciale");
|
||||
print_titre($langs->trans("NewProp"));
|
||||
|
||||
/*
|
||||
*
|
||||
@ -71,43 +81,41 @@ if ($_GET["action"] == 'create')
|
||||
print "<form action=\"propal.php?socidp=".$soc->id."\" method=\"post\">";
|
||||
print "<input type=\"hidden\" name=\"action\" value=\"add\">";
|
||||
|
||||
print '<table class="border" cellspacing="0" cellpadding="3" width="100%">';
|
||||
|
||||
print '<tr><td>Société</td><td><a href="fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a></td>';
|
||||
print '<table class="border" width="100%">';
|
||||
|
||||
print '<tr><td>'.$langs->trans("Ref").'</td><td><input name="ref" value="'.$numpr.'"></td>';
|
||||
|
||||
print '<td valign="top" colspan="2">';
|
||||
print $langs->trans("Comments").'</td></tr>';
|
||||
|
||||
print "<tr><td>Date</td><td>";
|
||||
print_date_select();
|
||||
print "</td>";
|
||||
|
||||
print '<tr><td>'.$langs->trans("Company").'</td><td><a href="fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a></td>';
|
||||
print '<td rowspan="5" colspan="2" valign="top">';
|
||||
print '<textarea name="note" wrap="soft" cols="40" rows="6"></textarea>';
|
||||
print '</tr>';
|
||||
|
||||
print '<tr><td>Auteur</td><td>'.$user->fullname.'</td></tr>';
|
||||
print '<tr><td>Numéro</td><td><input name="ref" value="'.$numpr.'"></td></tr>'."\n";
|
||||
print '<tr><td>Validité</td><td><input name="duree_validite" size="5" value="15"> jours</td></tr>';
|
||||
print "<tr><td>".$langs->trans("Date")."</td><td>";
|
||||
print_date_select();
|
||||
print "</td></tr>";
|
||||
|
||||
print '<tr><td>'.$langs->trans("Author").'</td><td>'.$user->fullname.'</td></tr>';
|
||||
print '<tr><td>Durée de validité</td><td><input name="duree_validite" size="5" value="15"> '.$langs->trans("days").'</td></tr>';
|
||||
|
||||
/*
|
||||
*
|
||||
* Destinataire de la propale
|
||||
*
|
||||
*/
|
||||
print "<tr><td>Contact</td><td>\n";
|
||||
print "<tr><td>".$langs->trans("Contact")."</td><td>\n";
|
||||
$sql = "SELECT p.idp, p.name, p.firstname, p.poste, p.phone, p.fax, p.email FROM ".MAIN_DB_PREFIX."socpeople as p";
|
||||
$sql .= " WHERE p.fk_soc = ".$soc->id;
|
||||
|
||||
if ( $db->query($sql) )
|
||||
{
|
||||
$langs->load("companies");
|
||||
|
||||
$i = 0 ;
|
||||
$numdest = $db->num_rows();
|
||||
|
||||
if ($numdest==0)
|
||||
{
|
||||
print 'Cette societe n\'a pas de contact, veuillez en créer un avant de faire votre proposition commerciale<br>';
|
||||
print '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?socid='.$soc->id.'&action=create">'.$langs->trans("AddContact").'</a>';
|
||||
print '<font class="error">Cette societe n\'a pas de contact, veuillez en créer un avant de faire votre proposition commerciale</font><br>';
|
||||
print '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?socid='.$soc->id.'&action=create&backtoreferer=1">'.$langs->trans("AddContact").'</a>';
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -119,9 +127,11 @@ if ($_GET["action"] == 'create')
|
||||
print '<option value="'.$contact->idp.'"';
|
||||
if ($contact->idp == $setcontact)
|
||||
{
|
||||
print ' SELECTED';
|
||||
print ' selected';
|
||||
}
|
||||
print '>'.$contact->firstname.' '.$contact->name.' ['.$contact->email.']</option>';
|
||||
print '>'.$contact->firstname.' '.$contact->name;
|
||||
if ($contact->email) { print ' <'.$contact->email.'>'; }
|
||||
print '</option>';
|
||||
$i++;
|
||||
}
|
||||
print '</select>';
|
||||
@ -129,54 +139,59 @@ if ($_GET["action"] == 'create')
|
||||
|
||||
$db->free();
|
||||
}
|
||||
else
|
||||
{
|
||||
print $db->error();
|
||||
}
|
||||
|
||||
|
||||
print '</td></tr>';
|
||||
/*
|
||||
*
|
||||
* Projet associé
|
||||
*
|
||||
*/
|
||||
print '<tr><td valign="top">Projet</td><td>';
|
||||
print '<option value="0"></option>';
|
||||
|
||||
$sql = "SELECT p.rowid, p.title FROM ".MAIN_DB_PREFIX."projet as p WHERE p.fk_soc =".$soc->id;
|
||||
|
||||
if ( $db->query($sql) )
|
||||
{
|
||||
$i = 0 ;
|
||||
$numprojet = $db->num_rows();
|
||||
|
||||
if ($numprojet==0)
|
||||
{
|
||||
print 'Cette société n\'a pas de projet.<br>';
|
||||
print '<a href=../projet/fiche.php?socidp='.$soc->id.'&action=create>Créer un projet</a>';
|
||||
}
|
||||
else
|
||||
{
|
||||
print '<select name="projetidp">';
|
||||
|
||||
while ($i < $numprojet)
|
||||
{
|
||||
$projet = $db->fetch_object();
|
||||
print "<option value=\"$projet->rowid\">$projet->title</option>";
|
||||
$i++;
|
||||
}
|
||||
print '</select>';
|
||||
}
|
||||
$db->free();
|
||||
}
|
||||
else
|
||||
{
|
||||
dolibarr_print_error($db);
|
||||
}
|
||||
|
||||
print '</td></tr>';
|
||||
|
||||
print '<tr>';
|
||||
if ($conf->projet->enabled) {
|
||||
|
||||
/*
|
||||
* Projet associé
|
||||
*/
|
||||
print '<td valign="top">'.$langs->trans("Project").'</td><td>';
|
||||
print '<option value="0"></option>';
|
||||
|
||||
$sql = "SELECT p.rowid, p.title FROM ".MAIN_DB_PREFIX."projet as p WHERE p.fk_soc =".$soc->id;
|
||||
|
||||
if ( $db->query($sql) )
|
||||
{
|
||||
$i = 0 ;
|
||||
$numprojet = $db->num_rows();
|
||||
|
||||
if ($numprojet==0)
|
||||
{
|
||||
print 'Cette société n\'a pas de projet.<br>';
|
||||
print '<a href=../projet/fiche.php?socidp='.$soc->id.'&action=create>'.$langs->trans("AddProject").'</a>';
|
||||
}
|
||||
else
|
||||
{
|
||||
print '<select name="projetidp">';
|
||||
|
||||
while ($i < $numprojet)
|
||||
{
|
||||
$projet = $db->fetch_object();
|
||||
print "<option value=\"$projet->rowid\">".$projet->title."</option>";
|
||||
$i++;
|
||||
}
|
||||
print '</select>';
|
||||
}
|
||||
$db->free();
|
||||
}
|
||||
else
|
||||
{
|
||||
dolibarr_print_error($db);
|
||||
}
|
||||
|
||||
print '</td>';
|
||||
}
|
||||
else {
|
||||
print '<td colspan="2"> </td>';
|
||||
}
|
||||
|
||||
print '</td>';
|
||||
print '<td>Modèle</td>';
|
||||
print '<td>';
|
||||
$html = new Form($db);
|
||||
@ -184,46 +199,54 @@ if ($_GET["action"] == 'create')
|
||||
$html->select_array("modelpdf",$modelpdf->liste_array(),PROPALE_ADDON_PDF);
|
||||
print "</td></tr></table>";
|
||||
|
||||
/*
|
||||
*
|
||||
* Liste des elements
|
||||
*
|
||||
*/
|
||||
$sql = "SELECT p.rowid,p.label,p.ref,p.price FROM ".MAIN_DB_PREFIX."product as p ";
|
||||
$sql .= " WHERE envente = 1";
|
||||
$sql .= " ORDER BY ref DESC";
|
||||
if ( $db->query($sql) )
|
||||
{
|
||||
$opt = "<option value=\"0\" selected></option>";
|
||||
if ($result)
|
||||
{
|
||||
$num = $db->num_rows(); $i = 0;
|
||||
while ($i < $num)
|
||||
{
|
||||
$objp = $db->fetch_object();
|
||||
$opt .= "<option value=\"$objp->rowid\">[$objp->ref] ".substr($objp->label,0,40)."</option>\n";
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
$db->free();
|
||||
}
|
||||
else
|
||||
{
|
||||
print $db->error();
|
||||
}
|
||||
print '<br>';
|
||||
|
||||
print_titre("Services/Produits");
|
||||
if ($conf->produit->enabled || $conf->service->enabled) {
|
||||
/*
|
||||
* Liste les produits/services prédéfinis
|
||||
*/
|
||||
$sql = "SELECT p.rowid,p.label,p.ref,p.price FROM ".MAIN_DB_PREFIX."product as p ";
|
||||
$sql .= " WHERE envente = 1";
|
||||
$sql .= " ORDER BY ref DESC";
|
||||
if ( $db->query($sql) )
|
||||
{
|
||||
$opt = "<option value=\"0\" selected></option>";
|
||||
if ($result)
|
||||
{
|
||||
$num = $db->num_rows(); $i = 0;
|
||||
while ($i < $num)
|
||||
{
|
||||
$objp = $db->fetch_object();
|
||||
$opt .= "<option value=\"$objp->rowid\">[$objp->ref] ".substr($objp->label,0,40)."</option>\n";
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
$db->free();
|
||||
}
|
||||
else
|
||||
{
|
||||
dolibarr_print_error($db);
|
||||
}
|
||||
|
||||
$titre=$langs->trans("ProductsAndServices");
|
||||
$lib=$langs->trans("Product").'/'.$langs->trans("Services");
|
||||
|
||||
print_titre($titre);
|
||||
|
||||
print '<table class="border">';
|
||||
print '<tr><td>'.$lib.'</td><td>'.$langs->trans("Qty").'</td><td>Remise</td></tr>';
|
||||
for ($i = 1 ; $i <= PROPALE_NEW_FORM_NB_PRODUCT ; $i++)
|
||||
{
|
||||
print '<tr><td><select name="idprod'.$i.'">'.$opt.'</select></td>';
|
||||
print '<td><input type="text" size="2" name="qty'.$i.'" value="1"></td>';
|
||||
print '<td><input type="text" size="3" name="remise'.$i.'" value="'.$soc->remise_client.'"> %</td></tr>';
|
||||
}
|
||||
|
||||
print "</table>";
|
||||
|
||||
print '<table class="border">';
|
||||
print '<tr><td>Produit</td><td>Quan.</td><td>Remise</td></tr>';
|
||||
for ($i = 1 ; $i <= PROPALE_NEW_FORM_NB_PRODUCT ; $i++)
|
||||
{
|
||||
print '<tr><td><select name="idprod'.$i.'">'.$opt.'</select></td>';
|
||||
print '<td><input type="text" size="2" name="qty'.$i.'" value="1"></td>';
|
||||
print '<td><input type="text" size="3" name="remise'.$i.'" value="'.$soc->remise_client.'"> %</td></tr>';
|
||||
}
|
||||
|
||||
print "</table>";
|
||||
print '<br>';
|
||||
}
|
||||
|
||||
/*
|
||||
* Si il n'y a pas de contact pour la societe on ne permet pas la creation de propale
|
||||
*/
|
||||
|
||||
Loading…
Reference in New Issue
Block a user