From 80a4428955b3c3fb27352c6a2b435b987aaf51ce Mon Sep 17 00:00:00 2001 From: Gildas Rossignon Date: Tue, 10 Apr 2018 23:11:32 +0200 Subject: [PATCH 1/2] Fix value cond_reglement_id & mode_reglement_id I had a bug when trying to create a supplier proposal by this way : $fournisseur = new Societe($db); $fournisseur->fetch(1); $supplierproposal = new SupplierProposal($db, $fournisseur->id); if ($supplierproposal->create($user) < 1) { echo $supplierproposal->error . '

'; echo $db->lastquery; } This would generate an insert query with an empty value : INSERT INTO llx_supplier_proposal (fk_soc, price, remise, remise_percent, remise_absolue, tva, total, datec, ref, fk_user_author, note_private, note_public, model_pdf, fk_cond_reglement, fk_mode_reglement, fk_account, date_livraison, fk_shipping_method, fk_projet, entity, fk_multicurrency, multicurrency_code, multicurrency_tx) VALUES (1, 0, 0, null, null, 0, 0, '2018-04-10 23:01:52', '(PROV)', '1', '', '', '', , , NULL, null, NULL, null, 1, 0, 'EUR', 1) --- htdocs/supplier_proposal/class/supplier_proposal.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php index 8a6068f7116..4d66bddaf87 100644 --- a/htdocs/supplier_proposal/class/supplier_proposal.class.php +++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php @@ -838,8 +838,8 @@ class SupplierProposal extends CommonObject $sql.= ", '".$this->db->escape($this->note_private)."'"; $sql.= ", '".$this->db->escape($this->note_public)."'"; $sql.= ", '".$this->db->escape($this->modelpdf)."'"; - $sql.= ", ".$this->cond_reglement_id; - $sql.= ", ".$this->mode_reglement_id; + $sql.= ", ".($this->cond_reglement_id?$this->cond_reglement_id:'NULL'); + $sql.= ", ".($this->mode_reglement_id?$this->mode_reglement_id:'NULL'); $sql.= ", ".($this->fk_account>0?$this->fk_account:'NULL'); $sql.= ", ".($this->date_livraison!=''?"'".$this->db->idate($this->date_livraison)."'":"null"); $sql.= ", ".($this->shipping_method_id>0?$this->shipping_method_id:'NULL'); From 9634f4c82a79f8f21ef90ee18f54aa181be4f163 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 11 Apr 2018 17:29:45 +0200 Subject: [PATCH 2/2] Update supplier_proposal.class.php --- htdocs/supplier_proposal/class/supplier_proposal.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php index 4d66bddaf87..991e3ad5af8 100644 --- a/htdocs/supplier_proposal/class/supplier_proposal.class.php +++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php @@ -838,8 +838,8 @@ class SupplierProposal extends CommonObject $sql.= ", '".$this->db->escape($this->note_private)."'"; $sql.= ", '".$this->db->escape($this->note_public)."'"; $sql.= ", '".$this->db->escape($this->modelpdf)."'"; - $sql.= ", ".($this->cond_reglement_id?$this->cond_reglement_id:'NULL'); - $sql.= ", ".($this->mode_reglement_id?$this->mode_reglement_id:'NULL'); + $sql.= ", ".($this->cond_reglement_id > 0 ? $this->cond_reglement_id : 'NULL'); + $sql.= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : 'NULL'); $sql.= ", ".($this->fk_account>0?$this->fk_account:'NULL'); $sql.= ", ".($this->date_livraison!=''?"'".$this->db->idate($this->date_livraison)."'":"null"); $sql.= ", ".($this->shipping_method_id>0?$this->shipping_method_id:'NULL');