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

Fix: problem with $line->update_total if no $total_localtax

Browse Source
This commit is contained in:
Regis Houssin 2011-04-10 10:37:05 +00:00
parent a00ab18d1e
commit ee5c282ccd
3 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/commande/class/commande.class.php
View File

@ -2827,12 +2827,12 @@ class OrderLine
$sql.= " , total_ht=".price2num($this->total_ht).""; $sql.= " , total_ht=".price2num($this->total_ht)."";
$sql.= " , total_tva=".price2num($this->total_tva).""; $sql.= " , total_tva=".price2num($this->total_tva)."";
$sql.= " , total_ttc=".price2num($this->total_ttc).""; $sql.= " , total_ttc=".price2num($this->total_ttc)."";
$sql.= " , total_localtax1='".price2num($total_localtax1)."'"; $sql.= " , total_localtax1='".price2num($this->total_localtax1)."'";
$sql.= " , total_localtax2='".price2num($total_localtax2)."'"; $sql.= " , total_localtax2='".price2num($this->total_localtax2)."'";
$sql.= " , info_bits=".$this->info_bits; $sql.= " , info_bits=".$this->info_bits;
if ($date_start) { $sql.= " , date_start='".$this->db->idate($date_start)."'"; } if ($this->date_start) { $sql.= " , date_start='".$this->db->idate($this->date_start)."'"; }
else { $sql.=' , date_start=null'; } else { $sql.=' , date_start=null'; }
if ($date_end) { $sql.= " , date_end='".$this->db->idate($date_end)."'"; } if ($this->date_end) { $sql.= " , date_end='".$this->db->idate($this->date_end)."'"; }
$sql.= " , product_type=".$this->product_type; $sql.= " , product_type=".$this->product_type;
$sql.= " , fk_parent_line=".($this->fk_parent_line>0?$this->fk_parent_line:"null"); $sql.= " , fk_parent_line=".($this->fk_parent_line>0?$this->fk_parent_line:"null");
@ -2873,6 +2873,10 @@ class OrderLine
{ {
$this->db->begin(); $this->db->begin();
// Clean parameters
if (empty($this->total_localtax1)) $this->total_localtax1=0;
if (empty($this->total_localtax2)) $this->total_localtax2=0;
// Mise a jour ligne en base // Mise a jour ligne en base
$sql = "UPDATE ".MAIN_DB_PREFIX."commandedet SET"; $sql = "UPDATE ".MAIN_DB_PREFIX."commandedet SET";
$sql.= " total_ht='".price2num($this->total_ht)."'"; $sql.= " total_ht='".price2num($this->total_ht)."'";

3
htdocs/compta/facture.php
View File

@ -1059,7 +1059,8 @@ if ($_POST['action'] == 'updateligne' && $user->rights->facture->creer && $_POST
$localtax2_rate, $localtax2_rate,
'HT', 'HT',
$info_bits, $info_bits,
$type $type,
GETPOST('fk_parent_line')
); );
// Define output language // Define output language

18
htdocs/compta/facture/class/facture.class.php
View File

@ -3090,8 +3090,8 @@ class FactureLigne
var $total_ht; var $total_ht;
//! Total TVA de la ligne toute quantite et incluant la remise ligne //! Total TVA de la ligne toute quantite et incluant la remise ligne
var $total_tva; var $total_tva;
var $total_localtax1=0; //Total Local tax 1 de la ligne var $total_localtax1; //Total Local tax 1 de la ligne
var $total_localtax2=0; //Total Local tax 2 de la ligne var $total_localtax2; //Total Local tax 2 de la ligne
//! Total TTC de la ligne toute quantite et incluant la remise ligne //! Total TTC de la ligne toute quantite et incluant la remise ligne
var $total_ttc; var $total_ttc;
@ -3344,6 +3344,16 @@ class FactureLigne
// Clean parameters // Clean parameters
$this->desc=trim($this->desc); $this->desc=trim($this->desc);
if (empty($this->tva_tx)) $this->tva_tx=0;
if (empty($this->localtax1_tx)) $this->localtax1_tx=0;
if (empty($this->localtax2_tx)) $this->localtax2_tx=0;
if (empty($this->total_localtax1)) $this->total_localtax1=0;
if (empty($this->total_localtax2)) $this->total_localtax2=0;
if (empty($this->remise)) $this->remise=0;
if (empty($this->remise_percent)) $this->remise_percent=0;
if (empty($this->info_bits)) $this->info_bits=0;
if (empty($this->product_type)) $this->product_type=0;
if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
// Check parameters // Check parameters
if ($this->product_type < 0) return -1; if ($this->product_type < 0) return -1;
@ -3448,6 +3458,10 @@ class FactureLigne
$this->db->begin(); $this->db->begin();
dol_syslog("FactureLigne::update_total", LOG_DEBUG); dol_syslog("FactureLigne::update_total", LOG_DEBUG);
// Clean parameters
if (empty($this->total_localtax1)) $this->total_localtax1=0;
if (empty($this->total_localtax2)) $this->total_localtax2=0;
// Mise a jour ligne en base // Mise a jour ligne en base
$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet SET"; $sql = "UPDATE ".MAIN_DB_PREFIX."facturedet SET";
$sql.= " total_ht=".price2num($this->total_ht).""; $sql.= " total_ht=".price2num($this->total_ht)."";