| ';
print '';
print ' | ';
- if ($_GET['action'] == 'editdelivery')
+ if ($_GET['action'] == 'editavailability')
{
- $html->form_delivery($_SERVER['PHP_SELF'].'?id='.$object->id,$object->delivery,'delivery');
+ $html->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_availability,'availability');
}
else
{
- $html->form_delivery($_SERVER['PHP_SELF'].'?id='.$object->id,$object->delivery,'none');
+ $html->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_availability,'none');
}
print ' | ';
print '
';
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index b9362757d45..ca08ba00a71 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -95,7 +95,7 @@ class Propal extends CommonObject
var $fk_address;
var $address_type;
var $adresse;
- var $delivery;
+ var $fk_availability;
var $products=array();
@@ -618,7 +618,7 @@ class Propal extends CommonObject
$sql.= ", fk_mode_reglement";
$sql.= ", ref_client";
$sql.= ", date_livraison";
- $sql.= ", delivery";
+ $sql.= ", fk_availability";
$sql.= ", entity";
$sql.= ") ";
$sql.= " VALUES (";
@@ -641,7 +641,7 @@ class Propal extends CommonObject
$sql.= ", ".$this->mode_reglement_id;
$sql.= ", '".$this->db->escape($this->ref_client)."'";
$sql.= ", ".($this->date_livraison!=''?"'".$this->db->idate($this->date_livraison)."'":'null');
- $sql.= ", ".$this->delivery;
+ $sql.= ", ".$this->fk_availability;
$sql.= ", ".$conf->entity;
$sql.= ")";
@@ -904,7 +904,7 @@ class Propal extends CommonObject
$sql.= ", datep as dp";
$sql.= ", fin_validite as dfv";
$sql.= ", date_livraison as date_livraison";
- $sql.= ", delivery";
+ $sql.= ", fk_availability";
$sql.= ", model_pdf, ref_client";
$sql.= ", note, note_public";
$sql.= ", fk_projet, fk_statut";
@@ -958,7 +958,7 @@ class Propal extends CommonObject
$this->datep = $this->db->jdate($obj->dp);
$this->fin_validite = $this->db->jdate($obj->dfv);
$this->date_livraison = $this->db->jdate($obj->date_livraison);
- $this->delivery = $obj->delivery;
+ $this->fk_availability = $obj->fk_availability;
$this->fk_delivery_address = $obj->fk_adresse_livraison; // TODO obsolete
$this->fk_address = $obj->fk_adresse_livraison;
@@ -1237,23 +1237,23 @@ class Propal extends CommonObject
* \param delivery delai de livraison
* \return int <0 si ko, >0 si ok
*/
- function set_delivery($user, $delivery)
+ function set_availability($user, $id)
{
if ($user->rights->propale->creer)
{
$sql = "UPDATE ".MAIN_DB_PREFIX."propal ";
- $sql.= " SET delivery = '".$delivery."'";
+ $sql.= " SET fk_availability = '".$id."'";
$sql.= " WHERE rowid = ".$this->id;
if ($this->db->query($sql))
{
- $this->delivery = $delivery;
+ $this->fk_availability = $id;
return 1;
}
else
{
$this->error=$this->db->error();
- dol_syslog("Propal::set_delivery Erreur SQL");
+ dol_syslog("Propal::set_availability Erreur SQL");
return -1;
}
}
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 0faad6e7019..72207253463 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1491,17 +1491,17 @@ class Form
* \brief Charge dans cache la liste des délais de livraison possibles
* \return int Nb lignes chargees, 0 si deja chargees, <0 si ko
*/
- function load_cache_delivery()
+ function load_cache_availability()
{
global $langs;
- if (sizeof($this->cache_delivery)) return 0; // Cache deja charge
+ if (sizeof($this->cache_availability)) return 0; // Cache deja charge
- $sql = "SELECT rowid, code, libelle";
- $sql.= " FROM ".MAIN_DB_PREFIX.'c_delivery';
+ $sql = "SELECT rowid, code, label";
+ $sql.= " FROM ".MAIN_DB_PREFIX.'c_availability';
$sql.= " WHERE active=1";
$sql.= " ORDER BY rowid";
- dol_syslog('Form::load_cache_delivery sql='.$sql,LOG_DEBUG);
+ dol_syslog('Form::load_cache_availability sql='.$sql,LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -1512,9 +1512,9 @@ class Form
$obj = $this->db->fetch_object($resql);
// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
- $libelle=($langs->trans("DeliveryType".$obj->code)!=("DeliveryType".$obj->code)?$langs->trans("DeliveryType".$obj->code):($obj->libelle!='-'?$obj->libelle:''));
- $this->cache_delivery[$obj->rowid]['code'] =$obj->code;
- $this->cache_delivery[$obj->rowid]['label']=$libelle;
+ $label=($langs->trans("AvailabilityType".$obj->code)!=("AvailabilityType".$obj->code)?$langs->trans("AvailabilityType".$obj->code):($obj->label!='-'?$obj->label:''));
+ $this->cache_availability[$obj->rowid]['code'] =$obj->code;
+ $this->cache_availability[$obj->rowid]['label']=$label;
$i++;
}
return 1;
@@ -1532,15 +1532,15 @@ class Form
* \param filtertype Pour filtre
* \param addempty Ajoute entree vide
*/
- function select_delivery($selected='',$htmlname='delivery',$filtertype='',$addempty=0)
+ function select_availability($selected='',$htmlname='availability',$filtertype='',$addempty=0)
{
global $langs,$user;
- $this->load_cache_delivery();
+ $this->load_cache_availability();
print '