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

htdocs/modulebuilder/template/class/myobject.class.php

@@ -898,6 +898,64 @@ class MyObject extends CommonObject
 	    }
 	}
 
+	/**
+	 *  Returns the reference to the following non used object depending on the active numbering module.
+	 *
+	 *  @return string      		Object free reference
+	 */
+	public function getNextNumRef()
+	{
+		global $langs, $conf;
+		$langs->load("mymodule@myobject");
+
+		if (empty($conf->global->MYMODULE_MYOBJECT_ADDON)) {
+			$conf->global->MYMODULE_MYOBJECT_ADDON = 'mod_mymobject_standard';
+		}
+
+		if (!empty($conf->global->MYMODULE_MYOBJECT_ADDON))
+		{
+			$mybool = false;
+
+			$file = $conf->global->MYMODULE_MYOBJECT_ADDON.".php";
+			$classname = $conf->global->MYMODULE_MYOBJECT_ADDON;
+
+			// Include file with class
+			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+			foreach ($dirmodels as $reldir)
+			{
+				$dir = dol_buildpath($reldir."core/modules/mymodule/");
+
+				// Load file with numbering class (if found)
+				$mybool |= @include_once $dir.$file;
+			}
+
+			if ($mybool === false)
+			{
+				dol_print_error('', "Failed to include file ".$file);
+				return '';
+			}
+
+			$obj = new $classname();
+			$numref = $obj->getNextValue($this);
+
+			if ($numref != "")
+			{
+				return $numref;
+			}
+			else
+			{
+				$this->error = $obj->error;
+				//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
+				return "";
+			}
+		}
+		else
+		{
+			print $langs->trans("Error")." ".$langs->trans("Error_MYMODULE_MYOBJECT_ADDON_NotDefined");
+			return "";
+		}
+	}
+
 	/**
 	 *  Create a document onto disk according to template module.
 	 *

htdocs/modulebuilder/template/core/modules/modMyModule.class.php

@@ -334,13 +334,16 @@ class modMyModule extends DolibarrModules
         $this->export_code[$r]=$this->rights_class.'_'.$r;
         $this->export_label[$r]='MyObjectLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
         $this->export_icon[$r]='myobject@mymodule';
-        $keyforclass = 'MyObject'; $keyforclassfile='/mymobule/class/myobject.class.php'; $keyforelement='myobject';
+        // Define $this->export_fields_array, $this->export_TypeFields_array and $this->export_entities_array
+        $keyforclass = 'MyObject'; $keyforclassfile='/mymobule/class/myobject.class.php'; $keyforelement='myobject@mymodule';
         include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
-   		//$keyforclass = 'MyObjectLine'; $keyforclassfile='/mymodule/class/myobject.class.php'; $keyforelement='myobjectline'; $keyforalias='tl';
+        //$this->export_fields_array[$r]['t.fieldtoadd']='FieldToAdd'; $this->export_TypeFields_array[$r]['t.fieldtoadd']='Text';
+        //unset($this->export_fields_array[$r]['t.fieldtoremove']);
+   		//$keyforclass = 'MyObjectLine'; $keyforclassfile='/mymodule/class/myobject.class.php'; $keyforelement='myobjectline@mymodule'; $keyforalias='tl';
 		//include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
-        $keyforselect='myobject'; $keyforaliasextra='extra'; $keyforelement='myobject';
+        $keyforselect='myobject'; $keyforaliasextra='extra'; $keyforelement='myobject@mymodule';
         include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-        //$keyforselect='myobjectline'; $keyforaliasextra='extraline'; $keyforelement='myobjectline';
+        //$keyforselect='myobjectline'; $keyforaliasextra='extraline'; $keyforelement='myobjectline@mymodule';
         //include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
         //$this->export_dependencies_array[$r] = array('myobjectline'=>array('tl.rowid','tl.ref')); // To force to activate one or several fields if we select some fields that need same (like to select a unique key if we ask a field of a child to avoid the DISTINCT to discard them, or for computed field than need several other fields)
         //$this->export_special_array[$r] = array('t.field'=>'...');
@@ -362,9 +365,9 @@ class modMyModule extends DolibarrModules
          $this->export_code[$r]=$this->rights_class.'_'.$r;
          $this->export_label[$r]='MyObjectLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
          $this->export_icon[$r]='myobject@mymodule';
-         $keyforclass = 'MyObject'; $keyforclassfile='/mymobule/class/myobject.class.php'; $keyforelement='myobject';
+         $keyforclass = 'MyObject'; $keyforclassfile='/mymobule/class/myobject.class.php'; $keyforelement='myobject@mymodule';
          include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
-         $keyforselect='myobject'; $keyforaliasextra='extra'; $keyforelement='myobject';
+         $keyforselect='myobject'; $keyforaliasextra='extra'; $keyforelement='myobject@mymodule';
          include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
          //$this->export_dependencies_array[$r]=array('mysubobject'=>'ts.rowid', 't.myfield'=>array('t.myfield2','t.myfield3')); // To force to activate one or several fields if we select some fields that need same (like to select a unique key if we ask a field of a child to avoid the DISTINCT to discard them, or for computed field than need several other fields)
          $this->export_sql_start[$r]='SELECT DISTINCT ';

htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php

@@ -118,11 +118,10 @@ class mod_myobject_advanced extends ModeleNumRefMyObject
 	/**
 	 * 	Return next free value
 	 *
-	 *  @param	Product		$objprod    Object product
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-    public function getNextValue($objprod, $object)
+    public function getNextValue($object)
     {
 		global $db,$conf;
 

htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php

@@ -109,11 +109,10 @@ class mod_myobject_standard extends ModeleNumRefMyObject
 	/**
 	 * 	Return next free value
 	 *
-	 *  @param	Product		$objprod    Object product
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-	public function getNextValue($objprod, $object)
+	public function getNextValue($object)
 	{
 		global $db,$conf;