antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop

Browse Source
This commit is contained in:
Christophe Latour 2017-09-28 10:40:01 +02:00
commit 15f03de5da
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
adm/tabs/AdminOrders.php
View File

@ -1210,7 +1210,7 @@ class AdminOrders extends AdminTab
FROM '._DB_PREFIX_.'lapostews_return lpr
LEFT JOIN `'._DB_PREFIX_.'order_detail` od ON (od.`id_order_detail` = lpr.`id_order_detail`)
WHERE od.`id_order` ='. $order->id;
$sql4 = 'SELECT mrp.`shipping_number`, mrp.`date_add`
$sql4 = 'SELECT DISTINCT mrp.`shipping_number`, mrp.`date_add`
FROM '._DB_PREFIX_.'mondialrelay_parcel mrp
LEFT JOIN `'._DB_PREFIX_.'order_detail` od ON (od.`id_order_detail` = mrp.`id_order_detail`)
WHERE od.`id_order` ='. $order->id;

2
modules/ant_alerthack/models/Suspect.php
View File

@ -103,7 +103,7 @@ class Suspect extends ObjectModel
}
}
public function save()
public function save($nullValues = false, $autodate = true)
{
if (parent::save()) {
return true;

2
modules/ant_customgroup/models/CustomGroup.php
View File

@ -79,7 +79,7 @@ class CustomGroup extends ObjectModel
');
}
public function save()
public function save($nullValues = false, $autodate = true)
{
if (parent::save()) {
$return = true;

2
modules/ant_supplierdemand/models/SupplierDemand.php
View File

@ -123,7 +123,7 @@ class SupplierDemand extends ObjectModel
}
}
public function save()
public function save($nullValues = false, $autodate = true)
{
if (parent::save()) {
return true;