Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: Not error when migrating from version using exotic menu manager.

Browse Source 
Fix: Delete of member use id
This commit is contained in:
Laurent Destailleur
2013-05-12 15:25:12 +02:00
parent dbb0fa09ff
commit 7c543d0c2a
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/adherents/class/adherent.class.php
View File

@@ -690,6 +690,9 @@ class Adherent extends CommonObject
$error=0; $error=0;
$errorflag=0; $errorflag=0;
// Check parameters
if (empty($rowid)) $rowid=$this->id;
$this->db->begin(); $this->db->begin();
// Remove category // Remove category
@@ -1103,7 +1106,7 @@ class Adherent extends CommonObject
if (count($extralabels)>0) { if (count($extralabels)>0) {
$this->fetch_optionals($this->id,$extralabels); $this->fetch_optionals($this->id,$extralabels);
} }
// Load other properties // Load other properties
$result=$this->fetch_subscriptions(); $result=$this->fetch_subscriptions();
@@ -1534,7 +1537,7 @@ class Adherent extends CommonObject
$lien = '<a href="'.DOL_URL_ROOT.'/categories/categorie.php?id='.$this->id.'&type=3">'; $lien = '<a href="'.DOL_URL_ROOT.'/categories/categorie.php?id='.$this->id.'&type=3">';
$lienfin='</a>'; $lienfin='</a>';
} }
$picto='user'; $picto='user';
$label=$langs->trans("ShowMember"); $label=$langs->trans("ShowMember");

6
htdocs/main.inc.php
View File

@@ -823,9 +823,9 @@ if (! defined('NOREQUIREMENU'))
foreach($dirmenus as $dirmenu) foreach($dirmenus as $dirmenu)
{ {
$menufound=dol_include_once($dirmenu."standard/".$file_menu); $menufound=dol_include_once($dirmenu."standard/".$file_menu);
if ($menufound) break; if (class_exists('MenuManager')) break;
} }
if (! $menufound) // If failed to include, we try with standard if (! class_exists('MenuManager')) // If failed to include, we try with standard eldy_menu.php
{ {
dol_syslog("You define a menu manager '".$file_menu."' that can not be loaded.", LOG_WARNING); dol_syslog("You define a menu manager '".$file_menu."' that can not be loaded.", LOG_WARNING);
$file_menu='eldy_menu.php'; $file_menu='eldy_menu.php';
@@ -987,7 +987,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
//$arrayofcss=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css'); //$arrayofcss=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css');
print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jquerytreeview/jquery.treeview.css" />'."\n"; print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jquerytreeview/jquery.treeview.css" />'."\n";
} }
} }
print '<!-- Includes CSS for Dolibarr theme -->'."\n"; print '<!-- Includes CSS for Dolibarr theme -->'."\n";