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

Fix: Bad year saved for end planned date (service contracts)

Browse Source
This commit is contained in:
Laurent Destailleur 2008-02-21 15:53:46 +00:00
parent 4ce77c2b97
commit 0923b54d00
2 changed files with 98 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
htdocs/contrat/fiche.php
View File

@ -36,37 +36,8 @@ $langs->load("companies");
$langs->load("bills"); $langs->load("bills");
$langs->load("products"); $langs->load("products");
// Security check
if (! $user->rights->contrat->lire) restrictedArea($user,'contrat',$contratid,'contrat');
accessforbidden();
// Securite acces client et commerciaux
$contratid = isset($_GET["id"])?$_GET["id"]:'';
if ($user->societe_id > 0)
{
$action = '';
$socid = $user->societe_id;
}
// Protection restriction commercial
if ($contratid && !$user->rights->commercial->client->voir)
{
$sql = "SELECT sc.fk_soc, c.fk_soc";
$sql .= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."contrat as c";
$sql .= " WHERE c.rowid = ".$contratid;
if (!$user->rights->commercial->client->voir && !$user->societe_id > 0)
{
$sql .= " AND sc.fk_soc = c.fk_soc AND sc.fk_user = ".$user->id;
}
if ($user->societe_id > 0) $sql .= " AND c.fk_soc = ".$socid;
if ( $db->query($sql) )
{
if ( $db->num_rows() == 0) accessforbidden();
}
}
@ -112,14 +83,14 @@ if ($_POST["mode"]=='predefined')
{ {
$date_start=''; $date_start='';
$date_end=''; $date_end='';
if ($_POST["date_startmonth"] && $_POST["date_startday"] && $_POST["date_startyear"]) if ($_POST["date_startmonth"] && $_POST["date_startday"] && $_POST["date_startyear"])
{ {
$date_start=dolibarr_mktime(12, 0 , 0, $_POST["date_startmonth"], $_POST["date_startday"], $_POST["date_startyear"]); $date_start=dolibarr_mktime(12, 0 , 0, $_POST["date_startmonth"], $_POST["date_startday"], $_POST["date_startyear"]);
} }
if ($_POST["date_endmonth"] && $_POST["date_endday"] && $_POST["date_endyear"]) if ($_POST["date_endmonth"] && $_POST["date_endday"] && $_POST["date_endyear"])
{ {
$date_end=dolibarr_mktime(12, 0 , 0, $_POST["date_endmonth"], $_POST["date_endday"], $_POST["date_endyear"]); $date_end=dolibarr_mktime(12, 0 , 0, $_POST["date_endmonth"], $_POST["date_endday"], $_POST["date_endyear"]);
} }
} }
// Si ajout champ produit libre // Si ajout champ produit libre
@ -127,14 +98,14 @@ if ($_POST["mode"]=='libre')
{ {
$date_start_sl=''; $date_start_sl='';
$date_end_sl=''; $date_end_sl='';
if ($_POST["date_start_slmonth"] && $_POST["date_start_slday"] && $_POST["date_start_slyear"]) if ($_POST["date_start_slmonth"] && $_POST["date_start_slday"] && $_POST["date_start_slyear"])
{ {
$date_start_sl=dolibarr_mktime(12, 0 , 0, $_POST["date_start_slmonth"], $_POST["date_start_slday"], $_POST["date_start_slyear"]); $date_start_sl=dolibarr_mktime(12, 0 , 0, $_POST["date_start_slmonth"], $_POST["date_start_slday"], $_POST["date_start_slyear"]);
} }
if ($_POST["date_end_slmonth"] && $_POST["date_end_slday"] && $_POST["date_end_slyear"]) if ($_POST["date_end_slmonth"] && $_POST["date_end_slday"] && $_POST["date_end_slyear"])
{ {
$date_end_sl=dolibarr_mktime(12, 0 , 0, $_POST["date_end_slmonth"], $_POST["date_end_slday"], $_POST["date_end_slyear"]); $date_end_sl=dolibarr_mktime(12, 0 , 0, $_POST["date_end_slmonth"], $_POST["date_end_slday"], $_POST["date_end_slyear"]);
} }
} }
// Param si updateligne // Param si updateligne
@ -237,7 +208,7 @@ if ($_POST["action"] == 'addligne' && $user->rights->contrat->creer)
} }
if ($_POST['date_endyear'] && $_POST['date_endmonth'] && $_POST['date_endday']) if ($_POST['date_endyear'] && $_POST['date_endmonth'] && $_POST['date_endday'])
{ {
$date_end=dolibarr_mktime(12,0,0,$_POST['date_endmonth'],$_POST['date_endday'],$_POST['date_endmonth']); $date_end=dolibarr_mktime(12,0,0,$_POST['date_endmonth'],$_POST['date_endday'],$_POST['date_endyear']);
} }
} }
@ -1114,7 +1085,7 @@ else
$var=false; $var=false;
// Service sur produit predefini // Service sur produit predefini
print '<form name="addligne" action="fiche.php?id='.$id.'" method="post">'; print '<form name="addligne" action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="post">';
print '<input type="hidden" name="action" value="addligne">'; print '<input type="hidden" name="action" value="addligne">';
print '<input type="hidden" name="mode" value="predefined">'; print '<input type="hidden" name="mode" value="predefined">';
print '<input type="hidden" name="id" value="'.$id.'">'; print '<input type="hidden" name="id" value="'.$id.'">';
@ -1149,7 +1120,7 @@ else
$var=!$var; $var=!$var;
// Service libre // Service libre
print '<form name="addligne_sl" action="fiche.php?id='.$id.'" method="post">'; print '<form name="addligne_sl" action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="post">';
print '<input type="hidden" name="action" value="addligne">'; print '<input type="hidden" name="action" value="addligne">';
print '<input type="hidden" name="mode" value="libre">'; print '<input type="hidden" name="mode" value="libre">';
print '<input type="hidden" name="id" value="'.$id.'">'; print '<input type="hidden" name="id" value="'.$id.'">';
@ -1198,7 +1169,7 @@ else
{ {
print '<div class="tabsAction">'; print '<div class="tabsAction">';
if ($contrat->statut == 0 && $num) if (($contrat->statut == 0 || $conf->global->CONTRAT_EDITWHENVALIDATED) && $num)
{ {
print '<a class="butAction" href="fiche.php?id='.$id.'&amp;action=valid">'.$langs->trans("Validate").'</a>'; print '<a class="butAction" href="fiche.php?id='.$id.'&amp;action=valid">'.$langs->trans("Validate").'</a>';
} }

136
htdocs/lib/functions.inc.php
View File

@ -1227,77 +1227,83 @@ function info_admin($texte,$infoonimgalt=0)
\param dbtable Table de la base correspondant au module (optionnel) \param dbtable Table de la base correspondant au module (optionnel)
\param list Défini si la page sert de liste et donc ne fonctionne pas avec un id \param list Défini si la page sert de liste et donc ne fonctionne pas avec un id
*/ */
function restrictedArea($user, $modulename, $objectid='', $dbtablename='', $list=0) function restrictedArea($user, $modulename, $objectid='', $dbtablename='', $list=0)
{ {
global $db; global $db;
if (!$modulename) // Clean parameters
{ if (!$modulename)
$modulename = 'societe'; {
$list = 1; $modulename = 'societe';
} $list = 1;
}
$socid = 0; $objectid = 0;
$nocreate = 0; $socid = 0;
$nocreate = 0;
//si dbtable non défini, méme nom que le module // Check permission from module
if (!$dbtablename) $dbtablename = $modulename; if (! $user->rights->$modulename->lire)
{
accessforbidden();
}
else if (!$user->rights->$modulename->creer)
{
$nocreate = 1;
if ($_GET["action"] == 'create' || $_POST["action"] == 'create')
{
accessforbidden();
}
}
if (!$user->rights->$modulename->lire) // Check permission from company affiliation
{ if ($user->societe_id > 0)
accessforbidden(); {
} $_GET["action"] = '';
else if (!$user->rights->$modulename->creer) $_POST["action"] = '';
{ $socid = $user->societe_id;
$nocreate = 1; if (!$objectid) $objectid = $socid;
if ($_GET["action"] == 'create' || $_POST["action"] == 'create') if ($modulename == 'societe' && $socid <> $objectid) accessforbidden();
{ }
accessforbidden();
}
}
if ($user->societe_id > 0) if ($objectid)
{ {
$_GET["action"] = ''; if ($modulename == 'societe' && ! $user->rights->commercial->client->voir && ! $socid > 0)
$_POST["action"] = ''; {
$socid = $user->societe_id; $sql = "SELECT sc.fk_soc";
if (!$objectid) $objectid = $socid; $sql .= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc";
if ($modulename == 'societe' && $socid <> $objectid) accessforbidden(); $sql .= " WHERE sc.fk_soc = ".$objectid." AND sc.fk_user = ".$user->id;
} }
else if (! $user->rights->commercial->client->voir || $socid > 0)
{
// Si dbtable non défini, méme nom que le module
if (!$dbtablename) $dbtablename = $modulename;
if ($objectid) $sql = "SELECT sc.fk_soc, dbt.fk_soc";
{ $sql .= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX.$dbtablename." as dbt";
if ($modulename == 'societe' && !$user->rights->commercial->client->voir && !$socid > 0) $sql .= " WHERE dbt.rowid = ".$objectid;
{ if (!$user->rights->commercial->client->voir && !$socid > 0)
$sql = "SELECT sc.fk_soc"; {
$sql .= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql .= " AND sc.fk_soc = dbt.fk_soc AND sc.fk_user = ".$user->id;
$sql .= " WHERE sc.fk_soc = ".$objectid." AND sc.fk_user = ".$user->id; }
} if ($socid > 0) $sql .= " AND dbt.fk_soc = ".$socid;
else if (!$user->rights->commercial->client->voir || $socid > 0) }
{ //print $sql;
$sql = "SELECT sc.fk_soc, dbt.fk_soc"; if ($sql)
$sql .= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX.$dbtablename." as dbt"; {
$sql .= " WHERE dbt.rowid = ".$objectid; $resql=$db->query($sql);
if (!$user->rights->commercial->client->voir && !$socid > 0) if ($resql && $db->num_rows($resql) == 0)
{ {
$sql .= " AND sc.fk_soc = dbt.fk_soc AND sc.fk_user = ".$user->id; accessforbidden();
} }
if ($socid > 0) $sql .= " AND dbt.fk_soc = ".$socid; }
} }
//print $sql; else if ((!$objectid && $list==0) && $nocreate == 1)
if ($sql && $db->query($sql)) {
{ accessforbidden();
if ($db->num_rows() == 0) }
{
accessforbidden(); return $objectid;
}
}
}
else if ((!$objectid && $list==0) && $nocreate == 1)
{
accessforbidden();
}
return $objectid;
} }