Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop

dev/skeletons/skeleton_class.class.php

@@ -24,7 +24,7 @@
  */
 
 // Put here all includes required by your class file
-//require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
+require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
 //require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
 //require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 
@@ -32,13 +32,13 @@
 /**
  *	Put here description of your class
  */
-class Skeleton_Class // extends CommonObject
+class Skeleton_Class extends CommonObject
 {
 	var $db;							//!< To store db handler
 	var $error;							//!< To return error code (or message)
 	var $errors=array();				//!< To return several error codes (or messages)
-	//var $element='skeleton';			//!< Id that identify managed objects
+	var $element='skeleton';			//!< Id that identify managed objects
-	//var $table_element='skeleton';	//!< Name of table without prefix where object is stored
+	var $table_element='skeleton';		//!< Name of table without prefix where object is stored
 
     var $id;
     var $prop1;

htdocs/core/lib/functions.lib.php

@@ -562,29 +562,31 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename='
 /**
  *	Show tab header of a card
  *
- *	@param	array	$links		Array of tabs
+ *	@param	array	$links				Array of tabs
- *	@param	string	$active     Active tab name (document', 'info', 'ldap', ....)
+ *	@param	string	$active     		Active tab name (document', 'info', 'ldap', ....)
- *	@param  string	$title      Title
+ *	@param  string	$title      		Title
- *	@param  int		$notab		0=Add tab header, 1=no tab header
+ *	@param  int		$notab				0=Add tab header, 1=no tab header
- * 	@param	string	$picto		Add a picto on tab title
+ * 	@param	string	$picto				Add a picto on tab title
+ *	@param	int		$pictoisfullpath	If 1, image path is a full path. If you set this to 1, you can use url returned by dol_build_path('/mymodyle/img/myimg.png',1) for $picto.
  * 	@return	void
  */
-function dol_fiche_head($links=array(), $active='0', $title='', $notab=0, $picto='')
+function dol_fiche_head($links=array(), $active='0', $title='', $notab=0, $picto='', $pictoisfullpath=0)
 {
-	print dol_get_fiche_head($links, $active, $title, $notab, $picto);
+	print dol_get_fiche_head($links, $active, $title, $notab, $picto, $pictoisfullpath);
 }
 
 /**
  *  Show tab header of a card
  *
- *	@param	array	$links		Array of tabs
+ *	@param	array	$links				Array of tabs
- *	@param	int		$active     Active tab name
+ *	@param	int		$active     		Active tab name
- *	@param  string	$title      Title
+ *	@param  string	$title      		Title
- *	@param  int		$notab		0=Add tab header, 1=no tab header
+ *	@param  int		$notab				0=Add tab header, 1=no tab header
- * 	@param	string	$picto		Add a picto on tab title
+ * 	@param	string	$picto				Add a picto on tab title
+ *	@param	int		$pictoisfullpath	If 1, image path is a full path. If you set this to 1, you can use url returned by dol_build_path('/mymodyle/img/myimg.png',1) for $picto.
  * 	@return	void
  */
-function dol_get_fiche_head($links=array(), $active='0', $title='', $notab=0, $picto='')
+function dol_get_fiche_head($links=array(), $active='0', $title='', $notab=0, $picto='', $pictoisfullpath=0)
 {
 	$out="\n".'<div class="tabs">'."\n";
 
@@ -593,7 +595,7 @@ function dol_get_fiche_head($links=array(), $active='0', $title='', $notab=0, $p
 	{
 		$limittitle=30;
 		$out.='<a class="tabTitle">';
-		if ($picto) $out.=img_object('',$picto).' ';
+		if ($picto) $out.=img_picto('',($pictoisfullpath?'':'object_').$picto,'',$pictoisfullpath).' ';
 		$out.=dol_trunc($title,$limittitle);
 		$out.='</a>';
 	}

htdocs/core/menus/standard/auguria.lib.php

@@ -335,9 +335,10 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
  */
 function dol_auguria_showmenu($type_user, &$menuentry, &$listofmodulesforexternal)
 {
+	global $conf;
+
 	//print 'type_user='.$type_user.' module='.$menuentry['module'].' enabled='.$menuentry['enabled'].' perms='.$menuentry['perms'];
 	//print 'ok='.in_array($menuentry['module'], $listofmodulesforexternal);
-
 	if (empty($menuentry['enabled'])) return 0;	// Entry disabled by condition
 	if ($type_user && $menuentry['module'])
 	{

htdocs/core/menus/standard/eldy.lib.php

@@ -1160,9 +1160,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 	for ($i = 0; $i < $num; $i++)
 	{
 		$showmenu=true;
-		if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled'])) {
+		if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled'])) 	$showmenu=false;
-			$showmenu=false;
-		}
 
 		$alt++;
 		if (empty($menu_array[$i]['level']) && $showmenu)
@@ -1268,6 +1266,8 @@ function print_jmobile_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu)
  */
 function dol_eldy_showmenu($type_user, &$menuentry, &$listofmodulesforexternal)
 {
+	global $conf;
+
 	//print 'type_user='.$type_user.' module='.$menuentry['module'].' enabled='.$menuentry['enabled'].' perms='.$menuentry['perms'];
 	//print 'ok='.in_array($menuentry['module'], $listofmodulesforexternal);
 	if (empty($menuentry['enabled'])) return 0;	// Entry disabled by condition

htdocs/printipp/index.php

@@ -16,10 +16,10 @@
  */
 
 /**
-\file       htdocs/printipp/index.php
+ *	\file       htdocs/printipp/index.php
-\ingroup    printipp
+ *	\ingroup    printipp
-\brief      Printipp
+ *	\brief      Printipp
-*/
+ */
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/dolprintipp.class.php';
@@ -33,4 +33,5 @@ $printer->list_jobs('commande');
 
 llxFooter();
 
+$db->close();
 ?>