Fix: error sql

Fix: don't delete order if shipping exist
Fix: uniformize code
This commit is contained in:
Regis Houssin
2011-04-22 17:31:28 +00:00
parent cdf52cafcf
commit a39c95e3b4
2 changed files with 23 additions and 36 deletions

View File

@@ -1461,9 +1461,11 @@ class Commande extends CommonObject
function nb_expedition()
{
$sql = 'SELECT count(*)';
$sql.= ' FROM '.MAIN_DB_PREFIX.'expedition as e,';
$sql.= ' '.MAIN_DB_PREFIX."element_element as el ON el.fk_target = e.rowid AND el.targettype = 'shipping'";
$sql.= " WHERE el.fk_source = ".$this->id;
$sql.= ' FROM '.MAIN_DB_PREFIX.'expedition as e';
$sql.= ', '.MAIN_DB_PREFIX.'element_element as el';
$sql.= ' WHERE el.fk_source = '.$this->id;
$sql.= " AND el.fk_target = e.rowid";
$sql.= " AND el.targettype = 'shipping'";
$resql = $this->db->query($sql);
if ($resql)