// Merge -> revision 8851

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8854 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-09-28 16:03:30 +00:00
parent ccd0383e88
commit be8d2136be
8 changed files with 38 additions and 15 deletions
+2 -1
View File
@@ -59,7 +59,7 @@ class MondialRelay extends Module
{
$this->name = 'mondialrelay';
$this->tab = 'shipping_logistics';
$this->version = '1.7.3';
$this->version = '1.7.4';
parent::__construct();
@@ -1140,6 +1140,7 @@ class MondialRelay extends Module
o.`id_order` as id_order,
o.`id_customer` as id_customer,
o.`id_cart` as id_cart,
o.`id_lang` as id_lang,
mrs.`id_mr_selected` as id_mr_selected,
CONCAT(c.`firstname`, \' \', c.`lastname`) AS `customer`,
o.`total_paid_real` as total, o.`total_shipping` as shipping,