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

Debug v15

Browse Source
This commit is contained in:
Laurent Destailleur 2022-01-10 14:27:43 +01:00
parent c81f46842b
commit cfec02aaae
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
htdocs/compta/facture/class/facture-rec.class.php
View File

@ -470,11 +470,23 @@ class FactureRec extends CommonInvoice
$error = 0; $error = 0;
$sql = "UPDATE ".MAIN_DB_PREFIX."facture_rec SET"; $sql = "UPDATE ".MAIN_DB_PREFIX."facture_rec SET";
$sql .= " fk_soc = ".((int) $this->fk_soc); $sql .= " entity = ".((int) $this->entity).",";
$sql .= " titre = '".$this->db->escape($this->title)."',";
$sql .= " suspended = ".((int) $this->suspended).",";
$sql .= " fk_soc = ".((int) $this->socid).",";
$sql .= " total_tva = ".((float) $this->total_tva).",";
$sql .= " localtax1 = ".((float) $this->localtax1).",";
$sql .= " localtax2 = ".((float) $this->localtax2).",";
$sql .= " total_ht = ".((float) $this->total_ht).",";
$sql .= " total_ttc = ".((float) $this->total_ttc).",";
$sql .= " remise_percent = ".((float) $this->remise_percent);
// TODO Add missing fields // TODO Add missing fields
$sql .= " WHERE rowid = ".((int) $this->id); $sql .= " WHERE rowid = ".((int) $this->id);
$this->db->begin();
dol_syslog(get_class($this)."::update", LOG_DEBUG); dol_syslog(get_class($this)."::update", LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {
if (!$error) { if (!$error) {
@ -498,7 +510,7 @@ class FactureRec extends CommonInvoice
} else { } else {
$this->error = $this->db->lasterror(); $this->error = $this->db->lasterror();
$this->db->rollback(); $this->db->rollback();
return -2; return -1;
} }
} }
@ -531,9 +543,9 @@ class FactureRec extends CommonInvoice
//$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = f.rowid AND el.targettype = 'facture'"; //$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = f.rowid AND el.targettype = 'facture'";
$sql .= ' WHERE f.entity IN ('.getEntity('invoice').')'; $sql .= ' WHERE f.entity IN ('.getEntity('invoice').')';
if ($rowid) { if ($rowid) {
$sql .= ' AND f.rowid='.((int) $rowid); $sql .= ' AND f.rowid = '.((int) $rowid);
} elseif ($ref) { } elseif ($ref) {
$sql .= " AND f.titre='".$this->db->escape($ref)."'"; $sql .= " AND f.titre = '".$this->db->escape($ref)."'";
} else { } else {
$sql .= ' AND f.rowid = 0'; $sql .= ' AND f.rowid = 0';
} }
@ -2130,6 +2142,7 @@ class FactureLigneRec extends CommonInvoiceLine
$this->db->begin(); $this->db->begin();
dol_syslog(get_class($this)."::updateline", LOG_DEBUG); dol_syslog(get_class($this)."::updateline", LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {
if (!$error) { if (!$error) {

1
htdocs/core/class/commonobject.class.php
View File

@ -6109,6 +6109,7 @@ abstract class CommonObject
} }
$sql .= ")"; $sql .= ")";
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if (!$resql) { if (!$resql) {
$this->error = $this->db->lasterror(); $this->error = $this->db->lasterror();

2
htdocs/install/mysql/tables/llx_facture_rec.sql
View File

@ -35,7 +35,7 @@ create table llx_facture_rec
remise_percent real DEFAULT 0, remise_percent real DEFAULT 0,
remise_absolue real DEFAULT 0, remise_absolue real DEFAULT 0,
vat_src_code varchar(10) DEFAULT '', -- Vat code used as source of vat fields. Not strict foreign key here. vat_src_code varchar(10) DEFAULT '', -- TODO Remove this. Field is inside the table of lines
total_tva double(24,8) DEFAULT 0, total_tva double(24,8) DEFAULT 0,
localtax1 double(24,8) DEFAULT 0, -- amount localtax1 localtax1 double(24,8) DEFAULT 0, -- amount localtax1
localtax2 double(24,8) DEFAULT 0, -- amount localtax2 localtax2 double(24,8) DEFAULT 0, -- amount localtax2