From 12ef03f06dbd6c88f127233788b3d75cf5f7eb20 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Wed, 25 Nov 2020 10:58:34 +0100 Subject: [PATCH] fix banck tranfert supplier --- htdocs/compta/prelevement/class/bonprelevement.class.php | 6 +++++- htdocs/install/mysql/migration/12.0.0-13.0.0.sql | 2 ++ htdocs/install/mysql/tables/llx_prelevement_facture.sql | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php index bcf0ce8aa5a..2014710e555 100644 --- a/htdocs/compta/prelevement/class/bonprelevement.class.php +++ b/htdocs/compta/prelevement/class/bonprelevement.class.php @@ -164,10 +164,12 @@ class BonPrelevement extends CommonObject $result = 0; } else { $result = -1; + $this->errors[] = get_class($this)."::AddFacture " . $this->db->lasterror; dol_syslog(get_class($this)."::AddFacture Error $result"); } } else { $result = -2; + $this->errors[]=get_class($this)."::AddFacture linedid Empty"; dol_syslog(get_class($this)."::AddFacture Error $result"); } } else { @@ -245,6 +247,7 @@ class BonPrelevement extends CommonObject $line_id = $this->db->last_insert_id(MAIN_DB_PREFIX."prelevement_lignes"); $result = 0; } else { + $this->errors[]=get_class($this)."::addline Error -2 " .$this->db->lasterror; dol_syslog(get_class($this)."::addline Error -2"); $result = -2; } @@ -1121,7 +1124,8 @@ class BonPrelevement extends CommonObject if (!$resql) { $error++; - dol_syslog(__METHOD__."::Update Error=".$this->db->error(), LOG_ERR); + $this->errors[]=$this->db->lasterror(); + dol_syslog(__METHOD__."::Update Error=".$this->db->lasterror(), LOG_ERR); } } } diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql index 2ad8fb32896..9951375677c 100644 --- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql +++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql @@ -35,6 +35,8 @@ ALTER TABLE llx_payment_various MODIFY COLUMN ref varchar(30) NULL; ALTER TABLE llx_prelevement_bons ADD COLUMN type varchar(16) DEFAULT 'debit-order'; +ALTER TABLE llx_prelevement_facture CHANGE COLUMN fk_facture_foun fk_facture_fourn integer NULL; + ALTER TABLE llx_prelevement_facture_demande ADD INDEX idx_prelevement_facture_demande_fk_facture (fk_facture); ALTER TABLE llx_prelevement_facture_demande ADD INDEX idx_prelevement_facture_demande_fk_facture_fourn (fk_facture_fourn); diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.sql index dbe2cb85f84..53a329f4376 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.sql @@ -20,7 +20,7 @@ create table llx_prelevement_facture ( rowid integer AUTO_INCREMENT PRIMARY KEY, fk_facture integer NULL, - fk_facture_foun integer NULL, + fk_facture_fourn integer NULL, fk_prelevement_lignes integer NOT NULL )ENGINE=innodb;