From 8f1e99d977665ac5ebc6b45ec418d10f3cf6e4b5 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 15 Feb 2006 19:43:04 +0000 Subject: [PATCH] Ajout mode_reglement et cond_reglement --- htdocs/comm/propal.php | 4 ++-- htdocs/propal.class.php | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 84553ea4363..9fe6e030e60 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -385,7 +385,7 @@ if ($_POST['action'] == 'set_contact') if ($_POST["action"] == 'setconditions') { $propal = new Propal($db, $_GET["propalid"]); - $propal->cond_reglement=$_POST['cond_reglement_id']; + $propal->cond_reglement = $_POST['cond_reglement_id']; $sql = "UPDATE ".MAIN_DB_PREFIX."propal SET fk_cond_reglement='".$_POST['cond_reglement_id']."' WHERE rowid='".$propalid."'"; $result = $db->query($sql); } @@ -394,7 +394,7 @@ if ($_POST["action"] == 'setconditions') if ($_POST["action"] == 'setmode') { $propal = new Propal($db, $_GET["propalid"]); - $propal->mode_reglement=$_POST['mode_reglement_id']; + $propal->mode_reglement = $_POST['mode_reglement_id']; $sql = "UPDATE ".MAIN_DB_PREFIX."propal SET fk_mode_reglement='".$_POST['mode_reglement_id']."' WHERE rowid='".$propalid."'"; $result = $db->query($sql); } diff --git a/htdocs/propal.class.php b/htdocs/propal.class.php index cd4419c3472..5c599c1486a 100644 --- a/htdocs/propal.class.php +++ b/htdocs/propal.class.php @@ -503,6 +503,7 @@ class Propal $sql.= ", ".$this->db->pdate("fin_validite")."as dfv, model_pdf"; $sql.= ", note, note_public"; $sql.= ", fk_projet, fk_statut, remise_percent, fk_user_author"; + $sql.= ", fk_cond_reglement, fk_mode_reglement"; $sql.= ", c.label as statut_label"; $sql.= " FROM ".MAIN_DB_PREFIX."propal"; $sql.= "," . MAIN_DB_PREFIX."c_propalst as c"; @@ -539,6 +540,8 @@ class Propal $this->note_public = $obj->note_public; $this->statut = $obj->fk_statut; $this->statut_libelle = $obj->statut_label; + $this->cond_reglement = $obj->fk_cond_reglement; + $this->mode_reglement = $obj->fk_mode_reglement; $this->user_author_id = $obj->fk_user_author;