diff --git a/modules/ant_canonical/ant_canonical.php b/modules/ant_canonical/ant_canonical.php index f1257b1d..c2a2a9a4 100644 --- a/modules/ant_canonical/ant_canonical.php +++ b/modules/ant_canonical/ant_canonical.php @@ -79,8 +79,16 @@ class Ant_Canonical extends Module global $cookie; $product = new Product($id); - return $this->getLinkRewriteCategory($product->id_category_default, true) + $link = $this->getLinkRewriteCategory($product->id_category_default, true) .'/'.$id.'-'.$product->link_rewrite[$cookie->id_lang]; + + if (!empty($product->ean13)) { + $link .= '-' . $product->ean13; + } + + $link .= '.html'; + + return $link; } /** diff --git a/modules/philea_magistor/AdminPhileaMagistor.php b/modules/philea_magistor/AdminPhileaMagistor.php index 44d08d9d..8cacd78b 100644 --- a/modules/philea_magistor/AdminPhileaMagistor.php +++ b/modules/philea_magistor/AdminPhileaMagistor.php @@ -756,6 +756,7 @@ class AdminPhileaMagistor extends AdminTab { WHERE `id_sale` = '.(int) $CRR['id_sale'] .' AND `filename` LIKE "CRP%" AND `report_data` IS NOT NULL + ORDER BY `report_date` DESC '); $crr_report = Db::getInstance()->executeS(' SELECT `quantity_received`, `quantity_expected`, `status`, `date_upd`