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

New: Possibilit de gnrer une facture depuis un contrat

Browse Source
This commit is contained in:
Laurent Destailleur 2005-09-04 15:18:27 +00:00
parent 87cae12582
commit cf299a5bbf
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/compta/facture.php
View File

@ -238,8 +238,10 @@ if ($_POST["action"] == 'add')
$lines = $contrat->fetch_lignes(); $lines = $contrat->fetch_lignes();
for ($i = 0 ; $i < sizeof($lines) ; $i++) for ($i = 0 ; $i < sizeof($lines) ; $i++)
{ {
$liblignefac=($contrat->lignes[$i]->desc?$contrat->lignes[$i]->desc:$contrat->lignes[$i]->libelle);
$result = $facture->addline($facid, $result = $facture->addline($facid,
addslashes($lines[$i]->description), addslashes($liblignefac),
$lines[$i]->subprice, $lines[$i]->subprice,
$lines[$i]->qty, $lines[$i]->qty,
$lines[$i]->tva_tx, $lines[$i]->tva_tx,

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

@ -539,8 +539,9 @@ class Contrat
*/ */
function updateline($rowid, $desc, $pu, $qty, $remise_percent=0, $datestart='', $dateend='', $tvatx) function updateline($rowid, $desc, $pu, $qty, $remise_percent=0, $datestart='', $dateend='', $tvatx)
{ {
if ($this->statut == 0) // On doit pouvoir modifier datestart et dateend meme si non brouillon
{ // if ($this->statut == 0)
// {
// Nettoyage parametres // Nettoyage parametres
$qty=trim($qty); $qty=trim($qty);
$desc=trim($desc); $desc=trim($desc);
@ -595,12 +596,12 @@ class Contrat
return -1; return -1;
} }
} // }
else // else
{ // {
dolibarr_syslog("Contrat::UpdateLigne Erreur -2 Contrat en mode incompatible pour cette action"); // dolibarr_syslog("Contrat::UpdateLigne Erreur -2 Contrat en mode incompatible pour cette action");
return -2; // return -2;
} // }
} }
/** /**