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

Works on migration of relationship tables

Browse Source
This commit is contained in:
Regis Houssin 2009-12-12 09:13:41 +00:00
parent 66f0b3ecb7
commit e777fd039f
1 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -156,21 +156,39 @@ class Livraison extends CommonObject
} }
} }
if (! $error && $this->id && $this->origin_id)
{
$ret = $this->add_object_linked();
if (!$ret)
{
$error++;
}
if (! $conf->expedition->enabled) if (! $conf->expedition->enabled)
{ {
$sql = "UPDATE ".MAIN_DB_PREFIX."commande"; if ($conf->commande->enabled)
$sql.= " SET fk_statut = 2"; {
$sql.= " WHERE rowid = ".$this->commande_id; $sql = "UPDATE ".MAIN_DB_PREFIX."commande SET fk_statut = 2 WHERE rowid=".$this->origin_id;
dol_syslog("Livraison::create sql=".$sql, LOG_DEBUG); dol_syslog("Livraison::create sql=".$sql, LOG_DEBUG);
$resql=$this->db->query($sql); if (! $this->db->query($sql))
if (! $resql)
{ {
$error++; $error++;
} }
} }
else
{
// TODO definir un statut
$sql = "UPDATE ".MAIN_DB_PREFIX."propal SET fk_statut = 9 WHERE rowid=".$this->origin_id;
dol_syslog("Livraison::create sql=".$sql, LOG_DEBUG);
if (! $this->db->query($sql))
{
$error++;
}
}
}
}
if ($error==0) if (! $error)
{ {
$this->db->commit(); $this->db->commit();
return $this->id; return $this->id;
@ -242,23 +260,9 @@ class Livraison extends CommonObject
$sql = "SELECT l.rowid, l.fk_soc, l.date_creation, l.date_valid, l.ref, l.ref_client, l.fk_user_author,"; $sql = "SELECT l.rowid, l.fk_soc, l.date_creation, l.date_valid, l.ref, l.ref_client, l.fk_user_author,";
$sql.=" l.total_ht, l.fk_statut, l.fk_expedition, l.fk_user_valid, l.note, l.note_public"; $sql.=" l.total_ht, l.fk_statut, l.fk_expedition, l.fk_user_valid, l.note, l.note_public";
$sql.= ", ".$this->db->pdate("l.date_livraison")." as date_livraison, l.fk_adresse_livraison, l.model_pdf"; $sql.= ", ".$this->db->pdate("l.date_livraison")." as date_livraison, l.fk_adresse_livraison, l.model_pdf";
if ($conf->commande->enabled) $sql.= ", el.fk_source as origin_id";
{
$sql.= ", cl.fk_commande as origin_id";
}
else
{
$sql.= ", pl.fk_propal as origin_id";
}
$sql.= " FROM ".MAIN_DB_PREFIX."livraison as l"; $sql.= " FROM ".MAIN_DB_PREFIX."livraison as l";
if ($conf->commande->enabled) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON l.rowid = el.fk_target";
{
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."co_liv as cl ON cl.fk_livraison = l.rowid";
}
else
{
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."pr_liv as pl ON pl.fk_livraison = l.rowid";
}
$sql.= " WHERE l.rowid = ".$id; $sql.= " WHERE l.rowid = ".$id;
dol_syslog("Livraison::fetch sql=".$sql, LOG_DEBUG); dol_syslog("Livraison::fetch sql=".$sql, LOG_DEBUG);