From ea9ad8b1169cb10b0acbf0d3a7b29e68809135b4 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Thu, 16 Feb 2006 12:02:33 +0000
Subject: [PATCH] Ajout mode_reglement et cond_reglement dans propale

---
 htdocs/comm/addpropal.php | 11 +++++++++++
 htdocs/propal.class.php   |  4 ++++
 2 files changed, 15 insertions(+)

diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php
index 3451072b26c..355020e9902 100644
--- a/htdocs/comm/addpropal.php
+++ b/htdocs/comm/addpropal.php
@@ -39,6 +39,7 @@ if (defined("PROPALE_ADDON") && is_readable(DOL_DOCUMENT_ROOT ."/includes/module
 $langs->load("propal");
 $langs->load("projects");
 $langs->load("companies");
+$langs->load("bills");
 
 $user->getrights('propale');
 $user->getrights('fichinter');
@@ -106,6 +107,16 @@ if ($_GET["action"] == 'create')
     print '<tr><td>'.$langs->trans("Author").'</td><td>'.$user->fullname.'</td></tr>';
     print '<tr><td>'.$langs->trans("ValidityDuration").'</td><td><input name="duree_validite" size="5" value="15"> '.$langs->trans("days").'</td></tr>';
 
+	  // Conditions de réglement
+	  print '<tr><td nowrap>'.$langs->trans('PaymentConditions').'</td><td>';
+	  $form->select_conditions_paiements($soc->cond_reglement,'cond_reglement_id');
+	  print '</td></tr>';
+
+	  // Mode de réglement
+	  print '<tr><td>'.$langs->trans('PaymentMode').'</td><td>';
+	  $form->select_types_paiements($soc->mode_reglement,'mode_reglement_id');
+	  print '</td></tr>';
+
     /*
     * Destinataire de la propale
     */
diff --git a/htdocs/propal.class.php b/htdocs/propal.class.php
index 5c599c1486a..e5301a1b91a 100644
--- a/htdocs/propal.class.php
+++ b/htdocs/propal.class.php
@@ -58,6 +58,10 @@ class Propal
     var $price;
     var $status;
     var $fin_validite;
+    var $cond_reglement_id;
+	  var $cond_reglement_code;
+	  var $mode_reglement_id;
+	  var $mode_reglement_code;
     
     var $labelstatut=array();
     var $labelstatut_short=array();