lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix trad : change adresse versus address

Browse Source
This commit is contained in:
Grand Philippe 2013-02-15 19:36:09 +01:00
parent 2bfd6c40d0
commit 785e72d533
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/comm/propal/class/propal.class.php
View File

@ -90,7 +90,7 @@ class Propal extends CommonObject
var $fk_delivery_address; // deprecated (for compatibility) var $fk_delivery_address; // deprecated (for compatibility)
var $fk_address; var $fk_address;
var $address_type; var $address_type;
var $adresse; var $address;
var $availability_id; var $availability_id;
var $availability_code; var $availability_code;
var $demand_reason_id; var $demand_reason_id;
@ -789,7 +789,7 @@ class Propal extends CommonObject
if (! $error && $this->fk_delivery_address) if (! $error && $this->fk_delivery_address)
{ {
$sql = "UPDATE ".MAIN_DB_PREFIX."propal"; $sql = "UPDATE ".MAIN_DB_PREFIX."propal";
$sql.= " SET fk_adresse_livraison = ".$this->fk_delivery_address; $sql.= " SET fk_delivery_address = ".$this->fk_delivery_address;
$sql.= " WHERE ref = '".$this->ref."'"; $sql.= " WHERE ref = '".$this->ref."'";
$sql.= " AND entity = ".$conf->entity; $sql.= " AND entity = ".$conf->entity;
@ -985,7 +985,7 @@ class Propal extends CommonObject
$sql.= ", p.note as note_private, p.note_public"; $sql.= ", p.note as note_private, p.note_public";
$sql.= ", p.fk_projet, p.fk_statut"; $sql.= ", p.fk_projet, p.fk_statut";
$sql.= ", p.fk_user_author, p.fk_user_valid, p.fk_user_cloture"; $sql.= ", p.fk_user_author, p.fk_user_valid, p.fk_user_cloture";
$sql.= ", p.fk_adresse_livraison"; $sql.= ", p.fk_delivery_address";
$sql.= ", p.fk_availability"; $sql.= ", p.fk_availability";
$sql.= ", p.fk_input_reason"; $sql.= ", p.fk_input_reason";
$sql.= ", p.fk_cond_reglement"; $sql.= ", p.fk_cond_reglement";
@ -1049,8 +1049,8 @@ class Propal extends CommonObject
$this->demand_reason_id = $obj->fk_input_reason; $this->demand_reason_id = $obj->fk_input_reason;
$this->demand_reason_code = $obj->demand_reason_code; $this->demand_reason_code = $obj->demand_reason_code;
$this->demand_reason = $obj->demand_reason; $this->demand_reason = $obj->demand_reason;
$this->fk_delivery_address = $obj->fk_adresse_livraison; // TODO obsolete //$this->fk_delivery_address = $obj->fk_adresse_livraison; // TODO obsolete
$this->fk_address = $obj->fk_adresse_livraison; $this->fk_address = $obj->fk_delivery_address;
$this->mode_reglement_id = $obj->fk_mode_reglement; $this->mode_reglement_id = $obj->fk_mode_reglement;
$this->mode_reglement_code = $obj->mode_reglement_code; $this->mode_reglement_code = $obj->mode_reglement_code;

2
htdocs/install/mysql/tables/llx_propal.sql
View File

@ -65,6 +65,6 @@ create table llx_propal
fk_input_reason integer, fk_input_reason integer,
import_key varchar(14), import_key varchar(14),
extraparams varchar(255), -- for stock other parameters with json format extraparams varchar(255), -- for stock other parameters with json format
fk_adresse_livraison integer -- delivery address (deprecated) fk_delivery_address integer -- delivery address (deprecated)
)ENGINE=innodb; )ENGINE=innodb;