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

Fix: Missing parameter

Browse Source
This commit is contained in:
Laurent Destailleur 2012-11-03 15:33:49 +01:00
parent 7f2c6dc6eb
commit af0c1a5f76
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/cashdesk/class/Facturation.class.php
View File

@ -92,9 +92,13 @@ class Facturation
global $conf,$db; global $conf,$db;
$thirdpartyid = $_SESSION['CASHDESK_ID_THIRDPARTY']; $thirdpartyid = $_SESSION['CASHDESK_ID_THIRDPARTY'];
$societe = new Societe($db); $societe = new Societe($db);
$societe->fetch($thirdpartyid); $societe->fetch($thirdpartyid);
$product = new Product($db);
$product->fetch($this->id);
$sql = "SELECT taux"; $sql = "SELECT taux";
$sql.= " FROM ".MAIN_DB_PREFIX."c_tva"; $sql.= " FROM ".MAIN_DB_PREFIX."c_tva";
$sql.= " WHERE rowid = ".$this->tva(); $sql.= " WHERE rowid = ".$this->tva();
@ -109,13 +113,12 @@ class Facturation
//var_dump($vat_rate);exit; //var_dump($vat_rate);exit;
} }
else else
{ {
dol_print_error($db); dol_print_error($db);
} }
// Define part of HT, VAT, TTC // Define part of HT, VAT, TTC
$resultarray=calcul_price_total($this->qte,$this->prix(),$this->remisePercent(),$vat_rate,0,0,0,'HT',0); $resultarray=calcul_price_total($this->qte,$this->prix(),$this->remisePercent(),$vat_rate,0,0,$product->type,'HT',0);
// Calcul du total ht sans remise // Calcul du total ht sans remise
$total_ht = $resultarray[0]; $total_ht = $resultarray[0];
@ -132,9 +135,6 @@ class Facturation
$montant_remise_ht = ($resultarray[6] - $resultarray[0]); $montant_remise_ht = ($resultarray[6] - $resultarray[0]);
$this->montantRemise($montant_remise_ht); $this->montantRemise($montant_remise_ht);
$product = new Product($db);
$product->fetch($this->id);
$newcartarray=$_SESSION['poscart']; $newcartarray=$_SESSION['poscart'];
$i=count($newcartarray); $i=count($newcartarray);