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

suppression champs inutiles

Browse Source
This commit is contained in:
Regis Houssin 2006-05-29 15:19:34 +00:00
parent a24d6eaf37
commit ea9e5b2b64
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/livraison/livraison.class.php
View File

@ -74,11 +74,11 @@ class Livraison
$this->db->begin();
$sql = "INSERT INTO ".MAIN_DB_PREFIX."livraison (fk_soc, fk_soc_contact, date_creation, fk_user_author, fk_commande";
$sql = "INSERT INTO ".MAIN_DB_PREFIX."livraison (date_creation, fk_user_author";
if ($this->commande_id) $sql.= ", fk_commande";
if ($this->expedition_id) $sql.= ", fk_expedition";
$sql.= ")";
$sql.= " VALUES ($this->soc_id, $this->contactid, now(), $user->id, $this->commande_id";
$sql.= " VALUES (now(), $user->id, $this->commande_id";
if ($this->commande_id) $sql.= ", $this->commande_id";
if ($this->expedition_id) $sql.= ", $this->expedition_id";
$sql.= ")";
@ -197,7 +197,7 @@ class Livraison
{
global $conf;
$sql = "SELECT l.rowid, l.fk_soc, l.fk_soc_contact, l.date_creation, l.ref, l.fk_user_author,";
$sql = "SELECT l.rowid, l.date_creation, l.ref, l.fk_user_author,";
$sql .=" l.fk_statut, l.fk_commande, l.fk_expedition, l.fk_user_valid, l.note, l.note_public";
$sql .= ", ".$this->db->pdate("l.date_livraison")." as date_livraison, fk_adresse_livraison, model_pdf";
$sql .= " FROM ".MAIN_DB_PREFIX."livraison as l";
@ -210,8 +210,6 @@ class Livraison
$obj = $this->db->fetch_object($result);
$this->id = $obj->rowid;
$this->socid = $obj->fk_soc;
$this->contact_id = $obj->fk_soc_contact;
$this->ref = $obj->ref;
$this->statut = $obj->fk_statut;
$this->commande_id = $obj->fk_commande;

5
mysql/migration/2.0.0-2.1.0.sql
View File

@ -209,8 +209,6 @@ create table llx_livraison
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
tms timestamp,
fk_soc integer NOT NULL,
fk_soc_contact integer,
fk_commande integer DEFAULT 0,
fk_expedition integer,
ref varchar(30) NOT NULL,
@ -228,6 +226,9 @@ create table llx_livraison
UNIQUE INDEX (ref)
)type=innodb;
alter table llx_livraison drop column fk_soc;
alter table llx_livraison drop column fk_soc_contact;
create table llx_livraisondet
(
rowid integer AUTO_INCREMENT PRIMARY KEY,

2
mysql/tables/llx_livraison.sql
View File

@ -24,8 +24,6 @@ create table llx_livraison
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
tms timestamp,
fk_soc integer NOT NULL,
fk_soc_contact integer,
fk_commande integer DEFAULT 0, -- commande auquel est rattache le bon de livraison
fk_expedition integer, -- expedition auquel est rattache le bon de livraison
ref varchar(30) NOT NULL, -- delivery number