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

Possibilit de modifier le descriptif et le taux de tva y compris sur les lignes de produits prdfinis.

Browse Source
This commit is contained in:
Laurent Destailleur 2005-09-01 23:17:42 +00:00
parent fb934b7aa2
commit 45171da073
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/contrat/contrat.class.php
View File

@ -375,11 +375,8 @@ class Contrat
$qty = ereg_replace(",",".",$qty); $qty = ereg_replace(",",".",$qty);
$pu = ereg_replace(",",".",$pu); $pu = ereg_replace(",",".",$pu);
if (strlen(trim($qty))==0) dolibarr_syslog("Contrat::AddLine $desc, $pu, $qty, $txtva, $fk_product=0, $remise_percent=0, $datestart, $dateend");
{
$qty=1;
}
if ($fk_product > 0) if ($fk_product > 0)
{ {
$prod = new Product($this->db, $fk_product); $prod = new Product($this->db, $fk_product);
@ -394,7 +391,7 @@ class Contrat
$remise = 0; $remise = 0;
$price = ereg_replace(",",".",round($pu, 2)); $price = ereg_replace(",",".",round($pu, 2));
$subprice = $price; $subprice = $price;
if (trim(strlen($remise_percent)) > 0) if (strlen($remise_percent) > 0)
{ {
$remise = round(($pu * $remise_percent / 100), 2); $remise = round(($pu * $remise_percent / 100), 2);
$price = $pu - $remise; $price = $pu - $remise;

26
htdocs/contrat/fiche.php
View File

@ -41,12 +41,26 @@ $user->getrights('contrat');
if (! $user->rights->contrat->lire) if (! $user->rights->contrat->lire)
accessforbidden(); accessforbidden();
$startyear=isset($_POST["date_startyear"])&&$_POST["date_startyear"]?$_POST["date_startyear"]:0; $date_start='';
$endyear=isset($_POST["date_endyear"])&&$_POST["date_endyear"]?$_POST["date_endyear"]:0; $date_end='';
$date_start_update=mktime(12, 0 , 0, $_POST["date_start_updatemonth"], $_POST["date_start_updateday"], $startyear); $date_start_update='';
$date_end_update=mktime(12, 0 , 0, $_POST["date_end_updatemonth"], $_POST["date_end_updateday"], $startyear); $date_end_update='';
$date_start=mktime(12, 0 , 0, $_POST["date_startmonth"], $_POST["date_startday"], $endyear); if ($_POST["date_start_updatemonth"] && $_POST["date_start_updateday"] && $_POST["date_start_updateyear"])
$date_end=mktime(12, 0 , 0, $_POST["date_endmonth"], $_POST["date_endday"], $endyear); {
$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 // Sécurité accés client
if ($user->societe_id > 0) if ($user->societe_id > 0)