From 45171da0730f285a52a9940cd88be9ef16c2f36d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 1 Sep 2005 23:17:42 +0000
Subject: [PATCH] =?UTF-8?q?Possibilit=E9=20de=20modifier=20le=20descriptif?=
 =?UTF-8?q?=20et=20le=20taux=20de=20tva=20y=20compris=20sur=20les=20lignes?=
 =?UTF-8?q?=20de=20produits=20pr=E9d=E9finis.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/contrat/contrat.class.php |  9 +++------
 htdocs/contrat/fiche.php         | 26 ++++++++++++++++++++------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/htdocs/contrat/contrat.class.php b/htdocs/contrat/contrat.class.php
index 4bf7500894f..61efc118698 100644
--- a/htdocs/contrat/contrat.class.php
+++ b/htdocs/contrat/contrat.class.php
@@ -375,11 +375,8 @@ class Contrat
         $qty = ereg_replace(",",".",$qty);
         $pu = ereg_replace(",",".",$pu);
         
-        if (strlen(trim($qty))==0)
-        {
-            $qty=1;
-        }
-        
+        dolibarr_syslog("Contrat::AddLine $desc, $pu, $qty, $txtva, $fk_product=0, $remise_percent=0, $datestart, $dateend");
+
         if ($fk_product > 0)
         {
             $prod = new Product($this->db, $fk_product);
@@ -394,7 +391,7 @@ class Contrat
         $remise = 0;
         $price = ereg_replace(",",".",round($pu, 2));
         $subprice = $price;
-        if (trim(strlen($remise_percent)) > 0)
+        if (strlen($remise_percent) > 0)
         {
             $remise = round(($pu * $remise_percent / 100), 2);
             $price = $pu - $remise;
diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php
index 430cc9064ea..5dc7298d733 100644
--- a/htdocs/contrat/fiche.php
+++ b/htdocs/contrat/fiche.php
@@ -41,12 +41,26 @@ $user->getrights('contrat');
 if (! $user->rights->contrat->lire)
 accessforbidden();
 
-$startyear=isset($_POST["date_startyear"])&&$_POST["date_startyear"]?$_POST["date_startyear"]:0;
-$endyear=isset($_POST["date_endyear"])&&$_POST["date_endyear"]?$_POST["date_endyear"]:0;
-$date_start_update=mktime(12, 0 , 0, $_POST["date_start_updatemonth"], $_POST["date_start_updateday"], $startyear);
-$date_end_update=mktime(12, 0 , 0, $_POST["date_end_updatemonth"], $_POST["date_end_updateday"], $startyear);
-$date_start=mktime(12, 0 , 0, $_POST["date_startmonth"], $_POST["date_startday"], $endyear);
-$date_end=mktime(12, 0 , 0, $_POST["date_endmonth"], $_POST["date_endday"], $endyear);
+$date_start='';
+$date_end='';
+$date_start_update='';
+$date_end_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"]);
+}
+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"]);
+}
+if ($_POST["date_startmonth"] && $_POST["date_startday"] && $_POST["date_startyear"])
+{
+    $date_start=mktime(12, 0 , 0, $_POST["date_startmonth"], $_POST["date_startday"], $_POST["date_startyear"]);
+}
+if ($_POST["date_endmonth"] && $_POST["date_endday"] && $_POST["date_endyear"])
+{
+    $date_end=mktime(12, 0 , 0, $_POST["date_endmonth"], $_POST["date_endday"], $_POST["date_endyear"]);
+}
 
 // Sécurité accés client
 if ($user->societe_id > 0)