On utilise plus le modifier

This commit is contained in:
Rodolphe Quiedeville 2003-08-11 18:37:35 +00:00
parent 60d772c038
commit 9d2ea891c2
2 changed files with 119 additions and 106 deletions

View File

@ -92,12 +92,11 @@ class modPropale
"insert into llx_rights_def values (20,'Tous les droits sur les propositions commerciales','propale','a',0);", "insert into llx_rights_def values (20,'Tous les droits sur les propositions commerciales','propale','a',0);",
"insert into llx_rights_def values (21,'Lire les propositions commerciales','propale','r',1);", "insert into llx_rights_def values (21,'Lire les propositions commerciales','propale','r',1);",
"insert into llx_rights_def values (22,'Créer modifier les propositions commerciales','propale','w',0);", "insert into llx_rights_def values (22,'Créer modifier les propositions commerciales','propale','w',0);",
"insert into llx_rights_def values (23,'Modifier les propositions commerciales d\'autrui','propale','m',0);", "insert into llx_rights_def values (24,'Valider les propositions commerciales','propale','d',0);",
"insert into llx_rights_def values (24,'Valider les propositions commerciales','propale','d',0);" "insert into llx_rights_def values (25,'Clôturer les propositions commerciales','propale','d',0);",
"insert into llx_rights_def values (25,'Clôturer les propositions commerciales','propale','d',0);"
"insert into llx_rights_def values (26,'Supprimer les propositions commerciales','propale','d',0);" "insert into llx_rights_def values (26,'Supprimer les propositions commerciales','propale','d',0);"
); );
//"insert into llx_rights_def values (23,'Modifier les propositions commerciales d\'autrui','propale','m',0);",
for ($i = 0 ; $i < sizeof($sql) ; $i++) for ($i = 0 ; $i < sizeof($sql) ; $i++)
{ {
$this->db->query($sql[$i]); $this->db->query($sql[$i]);

View File

@ -25,6 +25,8 @@ require("../propal.class.php3");
require("../facture.class.php3"); require("../facture.class.php3");
$user->getrights('produit'); $user->getrights('produit');
$user->getrights('propale');
$user->getrights('facture');
$mesg = ''; $mesg = '';
if (!$user->rights->produit->lire) if (!$user->rights->produit->lire)
@ -330,12 +332,16 @@ if ($id && $action == '' && $product->envente)
$propal = New Propal($db); $propal = New Propal($db);
print '<table width="100%" border="0" cellpadding="3" cellspacing="0">'; print '<table width="100%" border="0" cellpadding="3" cellspacing="0">';
if($user->rights->propale->creer)
{
print '<tr><td width="50%" valign="top">'; print '<tr><td width="50%" valign="top">';
print_titre("Ajouter ma proposition"); print_titre("Ajouter ma proposition") . '</td>';
print '</td><td width="50%" valign="top">'; if($user->rights->propale->creer)
print_titre("Ajouter aux autres propositions"); {
print '</td></tr>'; print '<td width="50%" valign="top">';
print_titre("Ajouter aux autres propositions") . '</td>';
}
print '</tr>';
print '<tr><td width="50%" valign="top">'; print '<tr><td width="50%" valign="top">';
$sql = "SELECT s.nom, s.idp, p.rowid as propalid, p.price - p.remise as price, p.ref,".$db->pdate("p.datep")." as dp"; $sql = "SELECT s.nom, s.idp, p.rowid as propalid, p.price - p.remise as price, p.ref,".$db->pdate("p.datep")." as dp";
$sql .= " FROM llx_societe as s, llx_propal as p"; $sql .= " FROM llx_societe as s, llx_propal as p";
@ -351,7 +357,6 @@ if ($id && $action == '' && $product->envente)
while ($i < $num) while ($i < $num)
{ {
$objp = $db->fetch_object( $i); $objp = $db->fetch_object( $i);
$var=!$var; $var=!$var;
print "<TR $bc[$var]>"; print "<TR $bc[$var]>";
print "<td><a href=\"../comm/propal.php3?propalid=$objp->propalid\">$objp->ref</a></TD>\n"; print "<td><a href=\"../comm/propal.php3?propalid=$objp->propalid\">$objp->ref</a></TD>\n";
@ -371,7 +376,11 @@ if ($id && $action == '' && $product->envente)
$db->free(); $db->free();
} }
print '</td><td width="50%" valign="top">'; print '</td>';
if($user->rights->propale->creer)
{
print '<td width="50%" valign="top">';
$otherprop = $propal->liste_array(1, '<>'.$user->id); $otherprop = $propal->liste_array(1, '<>'.$user->id);
if (sizeof($otherprop)) if (sizeof($otherprop))
@ -388,8 +397,13 @@ if ($id && $action == '' && $product->envente)
print "</td></tr>"; print "</td></tr>";
print '</table></form>'; print '</table></form>';
} }
print '</td></tr>'; print '</td>';
}
print '</tr>';
}
if($user->rights->facture->creer)
{
print '<tr><td width="50%" valign="top">'; print '<tr><td width="50%" valign="top">';
print_titre("Ajouter ma facture"); print_titre("Ajouter ma facture");
print '</td><td width="50%" valign="top">'; print '</td><td width="50%" valign="top">';
@ -435,7 +449,7 @@ if ($id && $action == '' && $product->envente)
} }
print '</td><td width="50%" valign="top">'; print '</td><td width="50%" valign="top">';
print '</td></tr></table>'; print '</td></tr></table>';
}
} }