diff --git a/htdocs/contrat/contrat.class.php b/htdocs/contrat/contrat.class.php index 483b159fe7c..46e22e63343 100644 --- a/htdocs/contrat/contrat.class.php +++ b/htdocs/contrat/contrat.class.php @@ -583,7 +583,10 @@ class Contrat extends CommonObject global $langs; global $conf; - dolibarr_syslog("contrat.class.php::addline $desc, $pu, $qty, $txtva, $fk_product, $remise_percent, $date_start, $date_end"); + // Nettoyage parametres + if (! $txtva) $txtva=0; + + dolibarr_syslog("Contrat::addline $desc, $pu, $qty, $txtva, $fk_product, $remise_percent, $date_start, $date_end"); if ($this->statut == 0) { @@ -622,7 +625,9 @@ class Contrat extends CommonObject if ($date_end > 0) { $sql.= ",date_fin_validite"; } $sql.= ") VALUES ($this->id, '" . addslashes($label) . "','" . addslashes($desc) . "',"; $sql.= ($fk_product>0 ? $fk_product : "null"); - $sql.= ",".price2num($price).", '$qty', $txtva, $remise_percent,'".price2num($subprice)."','".price2num( $remise)."'"; + $sql.= ",".price2num($price).", '$qty', "; + $sql.= $txtva.","; + $sql.= $remise_percent.",'".price2num($subprice)."','".price2num( $remise)."'"; if ($date_start > 0) { $sql.= ",".$this->db->idate($date_start); } if ($date_end > 0) { $sql.= ",".$this->db->idate($date_end); } $sql.= ");"; @@ -634,7 +639,8 @@ class Contrat extends CommonObject } else { - $this->error=$this->db->error(); + $this->error=$this->db->error()." sql=".$sql; + dolibarr_syslog("Contrat::addline ".$this->error); return -1; } } diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 28247995a7c..e1c62287ae8 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -94,11 +94,11 @@ if ($_POST["mode"]=='libre') $date_end_sl=''; if ($_POST["date_start_slmonth"] && $_POST["date_start_slday"] && $_POST["date_start_slyear"]) { - $date_start_sl=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"]) { - $date_end_sl=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"]); } } @@ -109,19 +109,19 @@ $date_start_real_update=''; $date_end_real_update=''; if ($_POST["date_start_updatemonth"] && $_POST["date_start_updateday"] && $_POST["date_start_updateyear"]) { - $date_start_update=mktime(12, 0 , 0, $_POST["date_start_updatemonth"], $_POST["date_start_updateday"], $_POST["date_start_updateyear"]); + $date_start_update=dolibarr_mktime(12, 0 , 0, $_POST["date_start_updatemonth"], $_POST["date_start_updateday"], $_POST["date_start_updateyear"]); } if ($_POST["date_end_updatemonth"] && $_POST["date_end_updateday"] && $_POST["date_end_updateyear"]) { - $date_end_update=mktime(12, 0 , 0, $_POST["date_end_updatemonth"], $_POST["date_end_updateday"], $_POST["date_end_updateyear"]); + $date_end_update=dolibarr_mktime(12, 0 , 0, $_POST["date_end_updatemonth"], $_POST["date_end_updateday"], $_POST["date_end_updateyear"]); } if ($_POST["date_start_real_updatemonth"] && $_POST["date_start_real_updateday"] && $_POST["date_start_real_updateyear"]) { - $date_start_real_update=mktime(12, 0 , 0, $_POST["date_start_real_updatemonth"], $_POST["date_start_real_updateday"], $_POST["date_start_real_updateyear"]); + $date_start_real_update=dolibarr_mktime(12, 0 , 0, $_POST["date_start_real_updatemonth"], $_POST["date_start_real_updateday"], $_POST["date_start_real_updateyear"]); } if ($_POST["date_end_real_updatemonth"] && $_POST["date_end_real_updateday"] && $_POST["date_end_real_updateyear"]) { - $date_end_real_update=mktime(12, 0 , 0, $_POST["date_end_real_updatemonth"], $_POST["date_end_real_updateday"], $_POST["date_end_real_updateyear"]); + $date_end_real_update=dolibarr_mktime(12, 0 , 0, $_POST["date_end_real_updatemonth"], $_POST["date_end_real_updateday"], $_POST["date_end_real_updateyear"]); } @@ -130,7 +130,7 @@ if ($_POST["date_end_real_updatemonth"] && $_POST["date_end_real_updateday"] && */ if ($_POST["action"] == 'add') { - $datecontrat = mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); + $datecontrat = dolibarr_mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); $contrat = new Contrat($db); @@ -189,7 +189,7 @@ if ($_POST["action"] == 'addligne' && $user->rights->contrat->creer) } elseif ($_POST["mode"]=='libre') { - $result = $contrat->addline( + $result = $contrat->addline( $_POST["desc"], $_POST["pu"], $_POST["pqty"], @@ -626,7 +626,7 @@ else print '
| '; print $langs->trans("Project"); print ' | '; - if ($_GET["action"] != "classer") print ''.img_edit($langs->trans("SetProject")).' | '; + if ($_GET["action"] != "classer" && $user->rights->projet->creer) print ''.img_edit($langs->trans("SetProject")).' | '; print '