lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: problme de droit sur les contrats

Browse Source 
Fix: la date de livraison n'tait pas rcupre  la cration de la propal
modif sur l'affichage du projet dans la fiche propal
je rpond  la question "pourquoi une date de livraison sur une propal", elle sert pour informer le client sur les dlai de fabrication par exemple.
This commit is contained in:
Regis Houssin 2006-06-23 00:09:24 +00:00
parent 349a955516
commit 2c18d8ce97
5 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/comm/addpropal.php
View File

@ -182,6 +182,7 @@ if ($_GET["action"] == 'create')
// Date de livraison // Date de livraison
// A quoi sert une date de livraison sur une propale ? // A quoi sert une date de livraison sur une propale ?
// Si il y a date de livraison connue alors ne s'agit-il pas d'une commande plutot ? // Si il y a date de livraison connue alors ne s'agit-il pas d'une commande plutot ?
// Régis : c'est plus pour information afin que le client est un délai de fabrication par exemple.
if ($conf->global->PROPAL_ADD_SHIPPING_DATE) if ($conf->global->PROPAL_ADD_SHIPPING_DATE)
{ {
print '<tr><td>'.$langs->trans("DateDelivery").'</td>'; print '<tr><td>'.$langs->trans("DateDelivery").'</td>';

32
htdocs/comm/propal.php
View File

@ -197,7 +197,7 @@ if ($_POST['action'] == 'add')
else else
{ {
$propal->datep = mktime(12, 1, 1, $_POST['remonth'], $_POST['reday'], $_POST['reyear']); $propal->datep = mktime(12, 1, 1, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
$propal->date_livraison = $_POST['liv_year']."-".$_POST['liv_month']."-".$_POST['liv_day']; $propal->date_livraison = mktime(12, 1, 1, $_POST['liv_month']."-".$_POST['liv_day']."-".$_POST['liv_year']);
$propal->adresse_livraison_id = $_POST['adresse_livraison_id']; $propal->adresse_livraison_id = $_POST['adresse_livraison_id'];
$propal->duree_validite = $_POST['duree_validite']; $propal->duree_validite = $_POST['duree_validite'];
$propal->cond_reglement_id = $_POST['cond_reglement_id']; $propal->cond_reglement_id = $_POST['cond_reglement_id'];
@ -209,7 +209,6 @@ if ($_POST['action'] == 'add')
$propal->author = $user->id; $propal->author = $user->id;
$propal->note = $_POST['note']; $propal->note = $_POST['note'];
$propal->ref_client = $_POST['ref_client']; $propal->ref_client = $_POST['ref_client'];
$propal->ref = $_POST['ref']; $propal->ref = $_POST['ref'];
for ($i = 1 ; $i <= $conf->global->PROPALE_NEW_FORM_NB_PRODUCT ; $i++) for ($i = 1 ; $i <= $conf->global->PROPALE_NEW_FORM_NB_PRODUCT ; $i++)
@ -556,7 +555,7 @@ if ($_GET['action'] == 'del_ligne' && $user->rights->propale->creer && !$conf->g
propale_pdf_create($db, $propal->id, $propal->modelpdf, $outputlangs); propale_pdf_create($db, $propal->id, $propal->modelpdf, $outputlangs);
} }
if ($_POST['action'] == 'set_project') if ($_POST['action'] == 'classin')
{ {
$propal = new Propal($db); $propal = new Propal($db);
$propal->fetch($_GET['propalid']); $propal->fetch($_GET['propalid']);
@ -900,10 +899,13 @@ if ($_GET['propalid'] > 0)
if ($conf->projet->enabled) if ($conf->projet->enabled)
{ {
$langs->load("projects"); $langs->load("projects");
print '<tr><td>'.$langs->trans('Project').'</td>'; print '<tr><td>';
print '<table class="nobordernopadding" width="100%"><tr><td>';
print $langs->trans('Project').'</td>';
$numprojet = $societe->has_projects(); $numprojet = $societe->has_projects();
if (! $numprojet) if (! $numprojet)
{ {
print '</td></tr></table>';
print '<td colspan="2">'; print '<td colspan="2">';
print $langs->trans("NoProject").'</td><td>'; print $langs->trans("NoProject").'</td><td>';
print '<a href=../projet/fiche.php?socidp='.$societe->id.'&action=create>'.$langs->trans('AddProject').'</a>'; print '<a href=../projet/fiche.php?socidp='.$societe->id.'&action=create>'.$langs->trans('AddProject').'</a>';
@ -913,19 +915,24 @@ if ($_GET['propalid'] > 0)
{ {
if ($propal->statut == 0 && $user->rights->propale->creer) if ($propal->statut == 0 && $user->rights->propale->creer)
{ {
print '<td colspan="2">'; if ($_GET['action'] != 'classer' && $propal->brouillon) print '<td align="right"><a href="'.$_SERVER['PHP_SELF'].'?action=classer&amp;propalid='.$propal->id.'">'.img_edit($langs->trans('SetProject')).'</a></td>';
print '<form action="'.$_SERVER["PHP_SELF"].'?propalid='.$propal->id.'" method="post">'; print '</tr></table>';
print '<input type="hidden" name="action" value="set_project">'; print '</td><td colspan="3">';
$form->select_projects($societe->id, $propal->projetidp, 'projetidp'); if ($_GET['action'] == 'classer')
print '</td><td>'; {
print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">'; $form->form_project($_SERVER['PHP_SELF'].'?propalid='.$propal->id, $propal->socidp, $propal->projetidp, 'projetidp');
print '</form>'; }
print '</td>'; else
{
$form->form_project($_SERVER['PHP_SELF'].'?propalid='.$propal->id, $propal->socidp, $propal->projetidp, 'none');
}
print '</td></tr>';
} }
else else
{ {
if (!empty($propal->projetidp)) if (!empty($propal->projetidp))
{ {
print '</td></tr></table>';
print '<td colspan="3">'; print '<td colspan="3">';
$proj = new Project($db); $proj = new Project($db);
$proj->fetch($propal->projetidp); $proj->fetch($propal->projetidp);
@ -935,6 +942,7 @@ if ($_GET['propalid'] > 0)
print '</td>'; print '</td>';
} }
else { else {
print '</td></tr></table>';
print '<td colspan="3">&nbsp;</td>'; print '<td colspan="3">&nbsp;</td>';
} }
} }

2
htdocs/contrat/contact.php
View File

@ -52,7 +52,7 @@ if ($user->societe_id > 0)
} }
// Protection restriction commercial // Protection restriction commercial
if ($contratid) if ($contratid && (!$user->rights->commercial->client->voir || $user->societe_id > 0))
{ {
$sql = "SELECT sc.fk_soc, c.fk_soc"; $sql = "SELECT sc.fk_soc, c.fk_soc";
$sql .= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."contrat as c"; $sql .= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."contrat as c";

2
htdocs/contrat/info.php
View File

@ -45,7 +45,7 @@ if ($user->societe_id > 0)
} }
// Protection restriction commercial // Protection restriction commercial
if ($contratid) if ($contratid && (!$user->rights->commercial->client->voir || $user->societe_id > 0))
{ {
$sql = "SELECT sc.fk_soc, c.fk_soc"; $sql = "SELECT sc.fk_soc, c.fk_soc";
$sql .= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."contrat as c"; $sql .= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."contrat as c";

2
htdocs/contrat/note.php
View File

@ -50,7 +50,7 @@ if ($user->societe_id > 0)
} }
// Protection restriction commercial // Protection restriction commercial
if ($contratid) if ($contratid && (!$user->rights->commercial->client->voir || $user->societe_id > 0))
{ {
$sql = "SELECT sc.fk_soc, c.fk_soc"; $sql = "SELECT sc.fk_soc, c.fk_soc";
$sql .= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."contrat as c"; $sql .= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."contrat as c";