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

Removed old deprecated code

Browse Source
This commit is contained in:
Laurent Destailleur 2009-08-04 11:32:22 +00:00
parent 64a2b4c39b
commit b729b14624
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/install/upgrade2.php
View File

@ -113,7 +113,7 @@ if (isset($_POST['action']) && $_POST['action'] == 'upgrade')
$conf->db->dolibarr_main_db_encryption = $dolibarr_main_db_encryption; $conf->db->dolibarr_main_db_encryption = $dolibarr_main_db_encryption;
if (empty($dolibarr_main_db_cryptkey)) $dolibarr_main_db_cryptkey=''; if (empty($dolibarr_main_db_cryptkey)) $dolibarr_main_db_cryptkey='';
$conf->db->dolibarr_main_db_cryptkey = $dolibarr_main_db_cryptkey; $conf->db->dolibarr_main_db_cryptkey = $dolibarr_main_db_cryptkey;
// Chargement config // Chargement config
if (! $error) $conf->setValues($db); if (! $error) $conf->setValues($db);
@ -206,7 +206,7 @@ if (isset($_POST['action']) && $_POST['action'] == 'upgrade')
// Script pour V2.6 -> V2.7 // Script pour V2.6 -> V2.7
migrate_menus($db,$langs,$conf); migrate_menus($db,$langs,$conf);
migrate_commande_deliveryaddress($db,$langs,$conf); migrate_commande_deliveryaddress($db,$langs,$conf);
@ -1497,6 +1497,7 @@ function migrate_price_commande_fournisseur($db,$langs,$conf)
$db->free($resql); $db->free($resql);
/*
$sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseurdet"; $sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseurdet";
$sql.= " WHERE subprice = 0 and total_ttc = 0 and total_tva = 0 and total_ht = 0"; $sql.= " WHERE subprice = 0 and total_ttc = 0 and total_tva = 0 and total_ht = 0";
$resql=$db->query($sql); $resql=$db->query($sql);
@ -1504,6 +1505,7 @@ function migrate_price_commande_fournisseur($db,$langs,$conf)
{ {
dol_print_error($db); dol_print_error($db);
} }
*/
$db->commit(); $db->commit();
} }
@ -2039,7 +2041,7 @@ function migrate_menus($db,$langs,$conf)
if ($db->DDLInfoTable(MAIN_DB_PREFIX."menu_constraint")) if ($db->DDLInfoTable(MAIN_DB_PREFIX."menu_constraint"))
{ {
$db->begin(); $db->begin();
$sql = "SELECT m.rowid, mc.action"; $sql = "SELECT m.rowid, mc.action";
$sql.= " FROM ".MAIN_DB_PREFIX."menu_constraint as mc, ".MAIN_DB_PREFIX."menu_const as md, ".MAIN_DB_PREFIX."menu as m"; $sql.= " FROM ".MAIN_DB_PREFIX."menu_constraint as mc, ".MAIN_DB_PREFIX."menu_const as md, ".MAIN_DB_PREFIX."menu as m";
$sql.= " WHERE md.fk_menu = m.rowid AND md.fk_constraint = mc.rowid"; $sql.= " WHERE md.fk_menu = m.rowid AND md.fk_constraint = mc.rowid";
@ -2054,16 +2056,16 @@ function migrate_menus($db,$langs,$conf)
while ($i < $num) while ($i < $num)
{ {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
$sql = "UPDATE ".MAIN_DB_PREFIX."menu SET"; $sql = "UPDATE ".MAIN_DB_PREFIX."menu SET";
$sql.= " enabled = '".$obj->action."'"; $sql.= " enabled = '".$obj->action."'";
$sql.= " WHERE rowid=".$obj->rowid; $sql.= " WHERE rowid=".$obj->rowid;
$sql.= " AND enabled = '1'"; $sql.= " AND enabled = '1'";
$resql2=$db->query($sql); $resql2=$db->query($sql);
if ($resql2) if ($resql2)
{ {
} }
else else
{ {
@ -2074,7 +2076,7 @@ function migrate_menus($db,$langs,$conf)
$i++; $i++;
} }
} }
if ($error == 0) if ($error == 0)
{ {
$db->commit(); $db->commit();
@ -2119,7 +2121,7 @@ function migrate_commande_deliveryaddress($db,$langs,$conf)
$sql.= ", ".MAIN_DB_PREFIX."co_exp as ce"; $sql.= ", ".MAIN_DB_PREFIX."co_exp as ce";
$sql.= " WHERE c.rowid = ce.fk_commande"; $sql.= " WHERE c.rowid = ce.fk_commande";
$sql.= " AND c.fk_adresse_livraison IS NOT NULL"; $sql.= " AND c.fk_adresse_livraison IS NOT NULL";
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql)
{ {