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

Fix: Ajout protection pour viter qu'une remise soit applique 2 fois sur une meme facture et ds cration du brouillon.

Browse Source
This commit is contained in:
Laurent Destailleur 2007-04-05 11:14:10 +00:00
parent 5b3a421275
commit 35eefd83ab
5 changed files with 406 additions and 356 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/propal.php
View File

@ -1174,6 +1174,8 @@ if ($_GET['propalid'] > 0)
} }
print '<td align="right">'.$objp->tva_tx.'%</td>'; print '<td align="right">'.$objp->tva_tx.'%</td>';
print '<td align="right">'.price($objp->subprice)."</td>\n"; print '<td align="right">'.price($objp->subprice)."</td>\n";
// Qty
print '<td align="right">'; print '<td align="right">';
if (($objp->info_bits & 2) != 2) if (($objp->info_bits & 2) != 2)
{ {

138
htdocs/compta/facture.php
View File

@ -545,18 +545,25 @@ if ($_POST['action'] == 'add' && $user->rights->facture->creer)
$desc=($prop->lignes[$i]->desc?$prop->lignes[$i]->desc:$prop->lignes[$i]->libelle); $desc=($prop->lignes[$i]->desc?$prop->lignes[$i]->desc:$prop->lignes[$i]->libelle);
$result = $facture->addline( $result = $facture->addline(
$facid, $facid,
$desc, $desc,
$prop->lignes[$i]->subprice, $prop->lignes[$i]->subprice,
$prop->lignes[$i]->qty, $prop->lignes[$i]->qty,
$prop->lignes[$i]->tva_tx, $prop->lignes[$i]->tva_tx,
$prop->lignes[$i]->fk_product, $prop->lignes[$i]->fk_product,
$prop->lignes[$i]->remise_percent, $prop->lignes[$i]->remise_percent,
'', '',
'', '',
0, 0,
$prop->lignes[$i]->info_bits, $prop->lignes[$i]->info_bits,
$prop->lignes[$i]->fk_remise_except); $prop->lignes[$i]->fk_remise_except
);
if ($result < 0)
{
$error++;
break;
}
} }
} }
else else
@ -589,18 +596,25 @@ if ($_POST['action'] == 'add' && $user->rights->facture->creer)
$desc=($lines[$i]->desc ? $lines[$i]->desc : $lines[$i]->libelle); $desc=($lines[$i]->desc ? $lines[$i]->desc : $lines[$i]->libelle);
$result = $facture->addline( $result = $facture->addline(
$facid, $facid,
$desc, $desc,
$lines[$i]->subprice, $lines[$i]->subprice,
$lines[$i]->qty, $lines[$i]->qty,
$lines[$i]->tva_tx, $lines[$i]->tva_tx,
$lines[$i]->fk_product, $lines[$i]->fk_product,
$lines[$i]->remise_percent, $lines[$i]->remise_percent,
'', '',
'', '',
0, 0,
$lines[$i]->info_bits, $lines[$i]->info_bits,
$lines[$i]->fk_remise_except); $lines[$i]->fk_remise_except
);
if ($result < 0)
{
$error++;
break;
}
} }
} }
else else
@ -640,18 +654,25 @@ if ($_POST['action'] == 'add' && $user->rights->facture->creer)
if ($contrat->lignes[$i]->date_fin_reel) $date_end=$contrat->lignes[$i]->date_fin_reel; if ($contrat->lignes[$i]->date_fin_reel) $date_end=$contrat->lignes[$i]->date_fin_reel;
$result = $facture->addline( $result = $facture->addline(
$facid, $facid,
$desc, $desc,
$lines[$i]->subprice, $lines[$i]->subprice,
$lines[$i]->qty, $lines[$i]->qty,
$lines[$i]->tva_tx, $lines[$i]->tva_tx,
$lines[$i]->fk_product, $lines[$i]->fk_product,
$lines[$i]->remise_percent, $lines[$i]->remise_percent,
$date_start, $date_start,
$date_end, $date_end,
0, 0,
$lines[$i]->info_bits, $lines[$i]->info_bits,
$lines[$i]->fk_remise_except); $lines[$i]->fk_remise_except
);
if ($result < 0)
{
$error++;
break;
}
} }
} }
else else
@ -679,6 +700,9 @@ if ($_POST['action'] == 'add' && $user->rights->facture->creer)
{ {
$db->rollback(); $db->rollback();
$_GET["action"]='create'; $_GET["action"]='create';
$_GET["propalid"]=$_POST["propalid"];
$_GET["commandeid"]=$_POST["commandeid"];
$_GET["contratid"]=$_POST["contratid"];
if (! $mesg) $mesg='<div class="error">'.$facture->error.'</div>'; if (! $mesg) $mesg='<div class="error">'.$facture->error.'</div>';
} }
} }
@ -1315,48 +1339,6 @@ if ($_GET['action'] == 'create')
$html->select_types_paiements($mode_reglement_id,'mode_reglement_id'); $html->select_types_paiements($mode_reglement_id,'mode_reglement_id');
print '</td></tr>'; print '</td></tr>';
// Réductions relatives (Remises-Ristournes-Rabbais)
/* Une réduction doit s'appliquer obligatoirement sur des lignes de factures
et non globalement
print '<tr><td>'.$langs->trans("CustomerRelativeDiscount").'</td>';
print '<td>';
if (! $_GET['propalid'] && ! $_GET['commandeid'] && ! $_GET['contratid']) print '<input type="text" name="remise_percent" size="1" value="';
print $remise_percent;
if (! $_GET['propalid'] && ! $_GET['commandeid'] && ! $_GET['contratid']) print '">';
print ' %';
print '</td><td>'.img_info().' ';
$relative_discount=$soc->remise_client;
if ($relative_discount)
{
print $langs->trans("CompanyHasRelativeDiscount",$relative_discount);
}
else
{
print $langs->trans("CompanyHasNoRelativeDiscount");
}
print '</td></tr>';
*/
// Réductions absolues (Remises-Ristournes-Rabbais)
/* Les remises absolues doivent s'appliquer par ajout de lignes spécialisées
print '<tr><td>'.$langs->trans("CustomerAbsoluteDiscount").'</td>';
print '<td>';
if (! $_GET['propalid'] && ! $_GET['commandeid'] && ! $_GET['contratid']) print '<input type="text" name="remise_absolue" size="1" value="';
print $remise_absolue;
if (! $_GET['propalid'] && ! $_GET['commandeid'] && ! $_GET['contratid']) print '">';
print ' '.$langs->trans("Currency".$conf->monnaie);
print '</td><td>'.img_info().' ';
if ($absolute_discount)
{
print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount,$langs->trans("Currency".$conf->monnaie));
}
else
{
print $langs->trans("CompanyHasNoAbsoluteDiscount");
}
print '</td></tr>';
*/
// Projet // Projet
if ($conf->projet->enabled) if ($conf->projet->enabled)
{ {

11
htdocs/compta/propal.php
View File

@ -407,7 +407,16 @@ if ($_GET["propalid"] > 0)
} }
print '<td align="right">'.$objp->tva_tx.'%</td>'; print '<td align="right">'.$objp->tva_tx.'%</td>';
print '<td align="right">'.price($objp->subprice)."</td>\n"; print '<td align="right">'.price($objp->subprice)."</td>\n";
print '<td align="right">'.$objp->qty.'</td>';
// Qty
print '<td align="right">';
if (($objp->info_bits & 2) != 2)
{
print $objp->qty;
}
else print '&nbsp;';
print '</td>';
if ($objp->remise_percent > 0) if ($objp->remise_percent > 0)
{ {
print '<td align="right">'.$objp->remise_percent."%</td>\n"; print '<td align="right">'.$objp->remise_percent."%</td>\n";

8
htdocs/discount.class.php
View File

@ -183,13 +183,13 @@ class DiscountAbsolute
/** /**
* \brief Link the discount to a particular invoice * \brief Link the discount to a particular invoice line
* \param rowid Invoice id * \param rowid Invoice line id
* \return int <0 ko, >0 ok * \return int <0 ko, >0 ok
*/ */
function link_to_invoice($rowid) function link_to_invoice($rowid)
{ {
dolibarr_syslog("Discount.class::link_to_invoice link discount ".$this->id." to invoice rowid=".$rowid); dolibarr_syslog("DiscountAbsolute::link_to_invoice link discount ".$this->id." to invoice line rowid=".$rowid);
$sql ="UPDATE ".MAIN_DB_PREFIX."societe_remise_except"; $sql ="UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
$sql.=" SET fk_facture = ".$rowid; $sql.=" SET fk_facture = ".$rowid;
@ -202,7 +202,7 @@ class DiscountAbsolute
else else
{ {
$this->error=$this->db->error(); $this->error=$this->db->error();
dolibarr_syslog("Discount.class::link_to_invoice ".$this->error." sql=".$sql); dolibarr_syslog("DiscountAbsolute::link_to_invoice ".$this->error." sql=".$sql);
return -1; return -1;
} }
} }

601
htdocs/facture.class.php
View File

@ -122,189 +122,198 @@ class Facture extends CommonObject
$this->remise_exceptionnelle = 0; $this->remise_exceptionnelle = 0;
} }
/** /**
\brief Création de la facture en base \brief Création de la facture en base
\param user Object utilisateur qui crée \param user Object utilisateur qui crée
\return int <0 si ko, >0 si ok \return int <0 si ko, >0 si ok
*/ */
function create($user) function create($user)
{ {
global $langs,$conf,$mysoc; global $langs,$conf,$mysoc;
// Nettoyage paramètres // Nettoyage paramètres
if (! $this->type) $this->type = 0; if (! $this->type) $this->type = 0;
$this->ref_client=trim($this->ref_client); $this->ref_client=trim($this->ref_client);
$this->note=trim($this->note); $this->note=trim($this->note);
$this->note_public=trim($this->note_public); $this->note_public=trim($this->note_public);
if (! $this->remise) $this->remise = 0; if (! $this->remise) $this->remise = 0;
if (! $this->mode_reglement_id) $this->mode_reglement_id = 0; if (! $this->mode_reglement_id) $this->mode_reglement_id = 0;
$this->brouillon = 1; $this->brouillon = 1;
dolibarr_syslog("Facture::Create"); dolibarr_syslog("Facture::Create user=".$user->id);
$soc = new Societe($this->db); $soc = new Societe($this->db);
$soc->fetch($this->socid); $soc->fetch($this->socid);
$this->db->begin(); $error=0;
// Facture récurrente $this->db->begin();
if ($this->fac_rec > 0)
{
require_once DOL_DOCUMENT_ROOT . '/compta/facture/facture-rec.class.php';
$_facrec = new FactureRec($this->db, $this->fac_rec);
$_facrec->fetch($this->fac_rec);
$this->projetid = $_facrec->projetid; // Facture récurrente
$this->cond_reglement = $_facrec->cond_reglement_id; if ($this->fac_rec > 0)
$this->cond_reglement_id = $_facrec->cond_reglement_id; {
$this->mode_reglement = $_facrec->mode_reglement_id; require_once DOL_DOCUMENT_ROOT . '/compta/facture/facture-rec.class.php';
$this->mode_reglement_id = $_facrec->mode_reglement_id; $_facrec = new FactureRec($this->db, $this->fac_rec);
$this->amount = $_facrec->amount; $_facrec->fetch($this->fac_rec);
$this->remise_absolue = $_facrec->remise_absolue;
$this->remise_percent = $_facrec->remise_percent;
$this->remise = $_facrec->remise;
}
// Definition de la date limite $this->projetid = $_facrec->projetid;
$datelim=$this->calculate_date_lim_reglement(); $this->cond_reglement = $_facrec->cond_reglement_id;
$this->cond_reglement_id = $_facrec->cond_reglement_id;
$this->mode_reglement = $_facrec->mode_reglement_id;
$this->mode_reglement_id = $_facrec->mode_reglement_id;
$this->amount = $_facrec->amount;
$this->remise_absolue = $_facrec->remise_absolue;
$this->remise_percent = $_facrec->remise_percent;
$this->remise = $_facrec->remise;
}
// Insertion dans la base // Definition de la date limite
$socid = $this->socid; $datelim=$this->calculate_date_lim_reglement();
$amount = $this->amount;
$remise = $this->remise;
$totalht = ($amount - $remise); // Insertion dans la base
$socid = $this->socid;
$amount = $this->amount;
$remise = $this->remise;
$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facture ('; $totalht = ($amount - $remise);
$sql.= ' facnumber, type, fk_soc, datec, amount, remise_absolue, remise_percent,';
$sql.= ' datef,';
$sql.= ' note,';
$sql.= ' note_public,';
$sql.= ' ref_client,';
$sql.= ' fk_facture_source, fk_user_author, fk_projet,';
$sql.= ' fk_cond_reglement, fk_mode_reglement, date_lim_reglement, model_pdf)';
$sql.= ' VALUES (';
$sql.= "'$number', '".$this->type."', '$socid', now(), '$totalht', '".$this->remise_absolue."'";
$sql.= ",'".$this->remise_percent."', ".$this->db->idate($this->date);
$sql.= ",".($this->note?"'".addslashes($this->note)."'":"null");
$sql.= ",".($this->note_public?"'".addslashes($this->note_public)."'":"null");
$sql.= ",".($this->ref_client?"'".addslashes($this->ref_client)."'":"null");
$sql.= ",".($this->fk_facture_source?"'".addslashes($this->fk_facture_source)."'":"null");
$sql.= ",".$user->id;
$sql.= ",".($this->projetid?$this->projetid:"null");
$sql.= ','.$this->cond_reglement_id;
$sql.= ",".$this->mode_reglement_id;
$sql.= ",".$this->db->idate($datelim).", '".$this->modelpdf."')";
$resql=$this->db->query($sql); $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facture (';
if ($resql) $sql.= ' facnumber, type, fk_soc, datec, amount, remise_absolue, remise_percent,';
{ $sql.= ' datef,';
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'facture'); $sql.= ' note,';
$sql.= ' note_public,';
$sql.= ' ref_client,';
$sql.= ' fk_facture_source, fk_user_author, fk_projet,';
$sql.= ' fk_cond_reglement, fk_mode_reglement, date_lim_reglement, model_pdf)';
$sql.= ' VALUES (';
$sql.= "'$number', '".$this->type."', '$socid', now(), '$totalht', '".$this->remise_absolue."'";
$sql.= ",'".$this->remise_percent."', ".$this->db->idate($this->date);
$sql.= ",".($this->note?"'".addslashes($this->note)."'":"null");
$sql.= ",".($this->note_public?"'".addslashes($this->note_public)."'":"null");
$sql.= ",".($this->ref_client?"'".addslashes($this->ref_client)."'":"null");
$sql.= ",".($this->fk_facture_source?"'".addslashes($this->fk_facture_source)."'":"null");
$sql.= ",".$user->id;
$sql.= ",".($this->projetid?$this->projetid:"null");
$sql.= ','.$this->cond_reglement_id;
$sql.= ",".$this->mode_reglement_id;
$sql.= ",".$this->db->idate($datelim).", '".$this->modelpdf."')";
$sql = 'UPDATE '.MAIN_DB_PREFIX."facture SET facnumber='(PROV".$this->id.")' WHERE rowid=".$this->id; dolibarr_syslog("Facture::Create sql=".$sql);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql)
{
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'facture');
// Mise a jour lien avec propal ou commande $sql = 'UPDATE '.MAIN_DB_PREFIX."facture SET facnumber='(PROV".$this->id.")' WHERE rowid=".$this->id;
if ($resql && $this->id && $this->propalid) $resql=$this->db->query($sql);
{ if (! $resql) $error++;
$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'fa_pr (fk_facture, fk_propal) VALUES ('.$this->id.','.$this->propalid.')';
$resql=$this->db->query($sql);
}
if ($resql && $this->id && $this->commandeid)
{
$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'co_fa (fk_facture, fk_commande) VALUES ('.$this->id.','.$this->commandeid.')';
$resql=$this->db->query($sql);
}
/* // Mise a jour lien avec propal ou commande
* Insertion du detail des produits dans la base if (! $error && $this->id && $this->propalid)
*/ {
for ($i = 0 ; $i < sizeof($this->products) ; $i++) $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'fa_pr (fk_facture, fk_propal) VALUES ('.$this->id.','.$this->propalid.')';
{ $resql=$this->db->query($sql);
$resql = $this->addline( if (! $resql) $error++;
$this->id, }
$this->products[$i]->desc, if (! $error && $this->id && $this->commandeid)
$this->products[$i]->subprice, {
$this->products[$i]->qty, $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'co_fa (fk_facture, fk_commande) VALUES ('.$this->id.','.$this->commandeid.')';
$this->products[$i]->tva_tx, $resql=$this->db->query($sql);
$this->products[$i]->fk_product, if (! $resql) $error++;
$this->products[$i]->remise_percent, }
$this->products[$i]->date_start,
$this->products[$i]->date_end
);
if ($resql < 0) /*
{ * Insertion du detail des produits dans la base,
$this->error=$this->db->error; * si tableau products défini.
dolibarr_print_error($this->db); */
break; for ($i = 0 ; $i < sizeof($this->products) ; $i++)
} {
} $result = $this->addline(
$this->id,
$this->products[$i]->desc,
$this->products[$i]->subprice,
$this->products[$i]->qty,
$this->products[$i]->tva_tx,
$this->products[$i]->fk_product,
$this->products[$i]->remise_percent,
$this->products[$i]->date_start,
$this->products[$i]->date_end
);
/* if ($result < 0)
* Produits de la facture récurrente {
*/ $error++;
if ($resql && $this->fac_rec > 0) break;
{ }
for ($i = 0 ; $i < sizeof($_facrec->lignes) ; $i++) }
{
if ($_facrec->lignes[$i]->produit_id)
{
$prod = new Product($this->db, $_facrec->lignes[$i]->produit_id);
$res=$prod->fetch($_facrec->lignes[$i]->produit_id);
}
$tva_tx = get_default_tva($mysoc,$soc,$prod->tva_tx);
$result_insert = $this->addline( /*
$this->id, * Produits de la facture récurrente
$_facrec->lignes[$i]->desc, */
$_facrec->lignes[$i]->subprice, if (! $error && $this->fac_rec > 0)
$_facrec->lignes[$i]->qty, {
$tva_tx, for ($i = 0 ; $i < sizeof($_facrec->lignes) ; $i++)
$_facrec->lignes[$i]->produit_id, {
$_facrec->lignes[$i]->remise_percent); if ($_facrec->lignes[$i]->produit_id)
{
$prod = new Product($this->db, $_facrec->lignes[$i]->produit_id);
$res=$prod->fetch($_facrec->lignes[$i]->produit_id);
}
$tva_tx = get_default_tva($mysoc,$soc,$prod->tva_tx);
if ( $result_insert < 0) $result_insert = $this->addline(
{ $this->id,
dolibarr_print_error($this->db); $_facrec->lignes[$i]->desc,
} $_facrec->lignes[$i]->subprice,
} $_facrec->lignes[$i]->qty,
} $tva_tx,
$_facrec->lignes[$i]->produit_id,
$_facrec->lignes[$i]->remise_percent);
if ($resql) if ( $result_insert < 0)
{ {
$resql=$this->update_price($this->id); $error++;
if ($resql) $this->error=$this->db->error();
{ break;
// Appel des triggers }
include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php"); }
$interface=new Interfaces($this->db); }
$result=$interface->run_triggers('BILL_CREATE',$this,$user,$langs,$conf);
// Fin appel triggers
$this->db->commit(); if (! $error)
return $this->id; {
} $resql=$this->update_price($this->id);
else if ($resql)
{ {
$this->db->rollback(); // Appel des triggers
return -3; include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php");
} $interface=new Interfaces($this->db);
} $result=$interface->run_triggers('BILL_CREATE',$this,$user,$langs,$conf);
else // Fin appel triggers
{
$this->db->rollback(); $this->db->commit();
return -2; return $this->id;
} }
} else
else {
{ $this->db->rollback();
$this->error=$this->db->error(); return -3;
dolibarr_syslog("Facture::create error ".$this->error." sql=".$sql); }
$this->db->rollback(); }
return -1; else
} {
} dolibarr_syslog("Facture::create error ".$this->error);
$this->db->rollback();
return -2;
}
}
else
{
$this->error=$this->db->error();
dolibarr_syslog("Facture::create error ".$this->error." sql=".$sql);
$this->db->rollback();
return -1;
}
}
/** /**
@ -1109,32 +1118,41 @@ class Facture extends CommonObject
// On vérifie si la facture était une provisoire // On vérifie si la facture était une provisoire
if (! $error && $facref == 'PROV') if (! $error && $facref == 'PROV')
{ {
/* $this->fetch_lines();
* Pour chaque produit, on met a jour indicateur nbvente
* On crée ici une dénormalisation des données pas forcément utilisée.
*/
$sql = 'SELECT fk_product FROM '.MAIN_DB_PREFIX.'facturedet';
$sql.= ' WHERE fk_facture = '.$this->id;
$sql.= ' AND fk_product > 0';
$resql = $this->db->query($sql); /* La vérif qu'une remise n'est pas utilisée 2 fois est faite au moment de l'insertion de ligne
if ($resql) foreach($this->lignes as $i => $line)
{ {
$num = $this->db->num_rows($resql); // For each line, we check if it's a discount and, if a discount,
$i = 0; // we check it is not already affected to another invoice
while ($i < $num) if ($line->fk_remise_except)
{ {
$obj = $this->db->fetch_object($resql); $discount=new DiscountAbsolute($this->db);
$sql = 'UPDATE '.MAIN_DB_PREFIX.'product SET nbvente=nbvente+1 WHERE rowid = '.$obj->fk_product; $result=$discount->fetch($line->fk_remise_except);
if ($result > 0)
{
}
else
{
$this->error=$discount->error;
$error++;
}
}
*/
// On met a jour table des ventes
// On crée ici une denormalisation pas forcement utilisé !!!
// TODO Virer utilisation du champ nbvente si utilisation non justifié
foreach($this->lignes as $i => $line)
{
if ($line->fk_product)
{
$sql = 'UPDATE '.MAIN_DB_PREFIX.'product SET nbvente=nbvente+1 WHERE rowid = '.$line->rowid;
$resql2 = $this->db->query($sql); $resql2 = $this->db->query($sql);
$i++; $i++;
} }
} }
else
{
$error++;
$this->error=$this->db->error().' sql='.$sql;
}
} }
if (! $error) if (! $error)
@ -1271,7 +1289,7 @@ class Facture extends CommonObject
* \param date_start Date de debut de validité du service * \param date_start Date de debut de validité du service
* \param date_end Date de fin de validité du service * \param date_end Date de fin de validité du service
* \param ventil Code de ventilation comptable * \param ventil Code de ventilation comptable
* \param info_bits Bits de type de lignes * \param info_bits Bits de type de lignes
* \remarks Les parametres sont deja censé etre juste et avec valeurs finales a l'appel * \remarks Les parametres sont deja censé etre juste et avec valeurs finales a l'appel
* de cette methode. Aussi, pour le taux tva, il doit deja avoir ete défini * de cette methode. Aussi, pour le taux tva, il doit deja avoir ete défini
* par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,taux_produit) * par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,taux_produit)
@ -1279,7 +1297,7 @@ class Facture extends CommonObject
*/ */
function addline($facid, $desc, $pu, $qty, $txtva, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $fk_remise_except='', $price_base_type='HT', $pu_ttc=0) function addline($facid, $desc, $pu, $qty, $txtva, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $fk_remise_except='', $price_base_type='HT', $pu_ttc=0)
{ {
dolibarr_syslog("Facture::Addline $facid,$desc,$pu,$qty,$txtva,$fk_product,$remise_percent,$date_start,$date_end,$ventil,$info_bits", LOG_DEBUG); dolibarr_syslog("Facture::Addline $facid,$desc,$pu,$qty,$txtva,$fk_product,$remise_percent,$date_start,$date_end,$ventil,$info_bits,$fk_remise_except", LOG_DEBUG);
include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');
if ($this->brouillon) if ($this->brouillon)
@ -1295,13 +1313,6 @@ class Facture extends CommonObject
$pu = price2num($pu); $pu = price2num($pu);
$txtva=price2num($txtva); $txtva=price2num($txtva);
// Si facture de type avoir, le montant est forcé négatif
if ($this->type == 2)
{
// $pu=-abs($pu);
// $txtva=-abs($txtva);
}
// Calcul du total TTC et de la TVA pour la ligne a partir de // Calcul du total TTC et de la TVA pour la ligne a partir de
// qty, pu, remise_percent et txtva // qty, pu, remise_percent et txtva
// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
@ -2659,7 +2670,8 @@ class FactureLigne
var $remise_percent; // % de la remise ligne (exemple 20%) var $remise_percent; // % de la remise ligne (exemple 20%)
var $rang = 0; var $rang = 0;
var $info_bits = 0; // Bit 0: 0 si TVA normal - 1 si TVA NPR var $info_bits = 0; // Bit 0: 0 si TVA normal - 1 si TVA NPR
//! Bit 1: 0 si ligne normal - 1 si bit discount // Bit 1: 0 si ligne normal - 1 si bit discount
//! Total HT de la ligne toute quantité et incluant la remise ligne //! Total HT de la ligne toute quantité et incluant la remise ligne
var $total_ht; var $total_ht;
//! Total TVA de la ligne toute quantité et incluant la remise ligne //! Total TVA de la ligne toute quantité et incluant la remise ligne
@ -2719,7 +2731,7 @@ class FactureLigne
$this->tva_tx = $objp->tva_taux; $this->tva_tx = $objp->tva_taux;
$this->remise_percent = $objp->remise_percent; $this->remise_percent = $objp->remise_percent;
$this->fk_remise_except = $objp->fk_remise_except; $this->fk_remise_except = $objp->fk_remise_except;
$this->produit_id = $objp->fk_product; $this->produit_id = $objp->fk_product; // Ne plus utiliser
$this->fk_product = $objp->fk_product; $this->fk_product = $objp->fk_product;
$this->date_start = $objp->date_start; $this->date_start = $objp->date_start;
$this->date_end = $objp->date_end; $this->date_end = $objp->date_end;
@ -2748,90 +2760,135 @@ class FactureLigne
} }
/** /**
* \brief Insère l'objet ligne de facture en base * \brief Insère l'objet ligne de facture en base
* \return int <0 si ko, >0 si ok * \return int <0 si ko, >0 si ok
*/ */
function insert() function insert()
{ {
dolibarr_syslog("FactureLigne::Insert rang=".$this->rang, LOG_DEBUG); global $langs;
$this->db->begin();
$rangtouse=$this->rang; dolibarr_syslog("FactureLigne::Insert rang=".$this->rang, LOG_DEBUG);
if ($rangtouse == -1) $this->db->begin();
{
// Récupère rang max de la facture dans $rangmax
$sql = 'SELECT max(rang) as max FROM '.MAIN_DB_PREFIX.'facturedet';
$sql.= ' WHERE fk_facture ='.$this->fk_facture;
$resql = $this->db->query($sql);
if ($resql)
{
$obj = $this->db->fetch_object($resql);
$rangtouse = $obj->max + 1;
}
else
{
dolibarr_print_error($this->db);
$this->db->rollback();
return -1;
}
}
// Insertion dans base de la ligne $rangtouse=$this->rang;
$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facturedet'; if ($rangtouse == -1)
$sql.= ' (fk_facture, description, qty, tva_taux,'; {
$sql.= ' fk_product, remise_percent, subprice, price, remise, fk_remise_except,'; // Récupère rang max de la facture dans $rangmax
$sql.= ' date_start, date_end, fk_code_ventilation, fk_export_compta, '; $sql = 'SELECT max(rang) as max FROM '.MAIN_DB_PREFIX.'facturedet';
$sql.= ' rang,'; $sql.= ' WHERE fk_facture ='.$this->fk_facture;
$sql.= ' info_bits, total_ht, total_tva, total_ttc)'; $resql = $this->db->query($sql);
$sql.= " VALUES (".$this->fk_facture.","; if ($resql)
$sql.= " '".addslashes($this->desc)."',"; {
$sql.= " '".price2num($this->qty)."',"; $obj = $this->db->fetch_object($resql);
$sql.= " '".price2num($this->tva_tx)."',"; $rangtouse = $obj->max + 1;
if ($this->fk_product) { $sql.= "'".$this->fk_product."',"; } }
else { $sql.='null,'; } else
$sql.= " '".price2num($this->remise_percent)."',"; {
$sql.= " '".price2num($this->subprice)."',"; dolibarr_print_error($this->db);
$sql.= " '".price2num($this->price)."',"; $this->db->rollback();
$sql.= " '".price2num($this->remise)."',"; return -1;
if ($this->fk_remise_except) $sql.= $this->fk_remise_except.","; }
else $sql.= 'null,'; }
if ($this->date_start) { $sql.= "'".$this->date_start."',"; }
else { $sql.='null,'; }
if ($this->date_end) { $sql.= "'".$this->date_end."',"; }
else { $sql.='null,'; }
$sql.= ' '.$this->fk_code_ventilation.',';
$sql.= ' '.$this->fk_export_compta.',';
$sql.= ' '.$rangtouse.',';
$sql.= " '".$this->info_bits."',";
$sql.= " '".price2num($this->total_ht)."',";
$sql.= " '".price2num($this->total_tva)."',";
$sql.= " '".price2num($this->total_ttc)."'";
$sql.= ')';
dolibarr_syslog("FactureLigne::insert sql=".$sql); // Insertion dans base de la ligne
$resql=$this->db->query($sql); $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facturedet';
if ($resql) $sql.= ' (fk_facture, description, qty, tva_taux,';
{ $sql.= ' fk_product, remise_percent, subprice, price, remise, fk_remise_except,';
$this->rowid=$this->db->last_insert_id(MAIN_DB_PREFIX.'facturedet'); $sql.= ' date_start, date_end, fk_code_ventilation, fk_export_compta, ';
$sql.= ' rang,';
$sql.= ' info_bits, total_ht, total_tva, total_ttc)';
$sql.= " VALUES (".$this->fk_facture.",";
$sql.= " '".addslashes($this->desc)."',";
$sql.= " '".price2num($this->qty)."',";
$sql.= " '".price2num($this->tva_tx)."',";
if ($this->fk_product) { $sql.= "'".$this->fk_product."',"; }
else { $sql.='null,'; }
$sql.= " '".price2num($this->remise_percent)."',";
$sql.= " '".price2num($this->subprice)."',";
$sql.= " '".price2num($this->price)."',";
$sql.= " '".price2num($this->remise)."',";
if ($this->fk_remise_except) $sql.= $this->fk_remise_except.",";
else $sql.= 'null,';
if ($this->date_start) { $sql.= "'".$this->date_start."',"; }
else { $sql.='null,'; }
if ($this->date_end) { $sql.= "'".$this->date_end."',"; }
else { $sql.='null,'; }
$sql.= ' '.$this->fk_code_ventilation.',';
$sql.= ' '.$this->fk_export_compta.',';
$sql.= ' '.$rangtouse.',';
$sql.= " '".$this->info_bits."',";
$sql.= " '".price2num($this->total_ht)."',";
$sql.= " '".price2num($this->total_tva)."',";
$sql.= " '".price2num($this->total_ttc)."'";
$sql.= ')';
// Appel des triggers dolibarr_syslog("FactureLigne::insert sql=".$sql);
include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php"); $resql=$this->db->query($sql);
$interface=new Interfaces($this->db); if ($resql)
$result = $interface->run_triggers('LINEBILL_INSERT',$this,$user,$langs,$conf); {
// Fin appel triggers $this->rowid=$this->db->last_insert_id(MAIN_DB_PREFIX.'facturedet');
$this->db->commit(); // Si fk_remise_except défini, on lie la remise à la facture
return $this->rowid; // ce qui la flague comme "consommée".
} if ($this->fk_remise_except)
else {
{ $discount=new DiscountAbsolute($this->db);
$this->error=$this->db->error(); $result=$discount->fetch($this->fk_remise_except);
dolibarr_syslog("FactureLigne::insert Error ".$this->error); if ($result >= 0)
$this->db->rollback(); {
return -2; // Check if discount was found
} if ($result > 0)
} {
// Check if discount not already affected to another invoice
if ($discount->fk_facture)
{
$this->error=$langs->trans("ErrorDiscountAlreadyUsed",$discount->id);
dolibarr_syslog("FactureLigne::insert Error ".$this->error);
$this->db->rollback();
return -3;
}
else
{
$discount->link_to_invoice($this->rowid);
}
}
else
{
$this->error=$langs->trans("ErrorADiscountThatHasBeenRemovedIsIncluded");
dolibarr_syslog("FactureLigne::insert Error ".$this->error);
$this->db->rollback();
return -3;
}
}
else
{
$this->error=$discount->error;
dolibarr_syslog("FactureLigne::insert Error ".$this->error);
$this->db->rollback();
return -3;
}
}
// Appel des triggers
include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php");
$interface=new Interfaces($this->db);
$result = $interface->run_triggers('LINEBILL_INSERT',$this,$user,$langs,$conf);
// Fin appel triggers
$this->db->commit();
return $this->rowid;
}
else
{
$this->error=$this->db->error();
dolibarr_syslog("FactureLigne::insert Error ".$this->error);
$this->db->rollback();
return -2;
}
}
/** /**