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

Merge branch 'fix-resetpassword-include' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2017-10-24 10:27:54 +02:00
commit 161673618e
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/ant_resetbopassword/ant_resetbopassword.php
View File

@ -2,7 +2,12 @@
if (!defined('_PS_VERSION_'))
exit;
require_once(PS_ADMIN_DIR . '/helpers/HelperFormBootstrap.php');
if (defined('PS_ADMIN_DIR'))
{
require_once(PS_ADMIN_DIR . '/helpers/HelperFormBootstrap.php');
} else {
require_once(realpath(dirname(__FILE__) .'/../../').'/adm/helpers/HelperFormBootstrap.php');
}
class Ant_Resetbopassword extends Module
{

2
modules/privatesales/AdminPrivateSalesSales.php
View File

@ -568,7 +568,7 @@ class AdminPrivateSalesSales extends AdminTab {
array(
'label' => $this->l('Livraison spécifique'),
'value' => 9,
'selected' => ($this->cursale!==NULL && $this->cursale->delivery_delay== 8?true:false)
'selected' => ($this->cursale!==NULL && $this->cursale->delivery_delay== 9?true:false)
),
);
// Delivery delay