diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index adce0950b88..b8300182b05 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -1,11 +1,15 @@
 # Dolibarr language file - Source file is en_US - loan
 ModuleBuilderDesc=This tools give you utilites to build or edit your own module.
-EnterNameOfModuleDesc=Enter name of the module to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...)
 ModuleBuilderDesc2=Path were modules are generated/edited (first alternative directory defined into %s): <strong>%s</strong>
 ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong> (they are detected as editable when the file <strong>%s</strong> exists in root of module directory). 
 NewModule=New module
+NewObject=New object
 ModuleKey=Key for new module
+ObjectKey=Key for new object
 ModuleInitialized=Module initialized
+FilesForObjectInitialized=Files for new object initialized
 ModuleBuilderDescdescription=Enter here all general information that describe your module
 ModuleBuilderDescobjects=Define here the new objects you want to manage with your module. A page to list them and a page to create/edit/view a card will be generated.
 ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 8cabec1bdfb..0f60d76ca4f 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -33,11 +33,13 @@ $action=GETPOST('action','aZ09');
 $confirm=GETPOST('confirm','alpha');
 $module=GETPOST('module','alpha');
 $tab=GETPOST('tab','aZ09');
+$tabobj=GETPOST('tabobj','alpha');
 if (empty($module)) $module='initmodule';
 if (empty($tab)) $tab='description';
+if (empty($tabobj)) $tabobj='newobject';
 
 $modulename=dol_sanitizeFileName(GETPOST('modulename','alpha'));
-
+$objectname=dol_sanitizeFileName(GETPOST('objectname','alpha'));
 
 // Security check
 if (! $user->admin && empty($conf->global->MODULEBUILDER_FOREVERYONE)) accessforbidden('ModuleBuilderNotAllowed');
@@ -80,6 +82,18 @@ if ($dirins && $action == 'initmodule' && $modulename)
     	}
     }
 
+    // Delete some files
+    dol_delete_file($destdir.'/myobject_card.php');
+    dol_delete_file($destdir.'/myobject_list.php');
+    dol_delete_file($destdir.'/test/phpunit/MyObjectTest.php');
+    dol_delete_file($destdir.'/sql/llx_myobject.key.sql');
+    dol_delete_file($destdir.'/sql/llx_myobject.sql');
+    dol_delete_file($destdir.'/scripts/myobject.php');
+    dol_delete_file($destdir.'/img/object_myobject.png');
+    dol_delete_file($destdir.'/class/myobject.class.php');
+    dol_delete_file($destdir.'/class/api_myobject.class.php');
+    dol_delete_file($destdir.'/class/MyObject.txt');
+
     // Edit PHP files
     if (! $error)
     {
@@ -113,6 +127,86 @@ if ($dirins && $action == 'initmodule' && $modulename)
     }
 }
 
+if ($dirins && $action == 'initobject' && $module && $objectname)
+{
+    $srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
+    $destdir = $dirins.'/'.strtolower($module);
+
+    $arrayreplacement=array(
+        'mymodule'=>strtolower($module),
+        'MyModule'=>$module,
+        'myobject'=>strtolower($objectname),
+        'MyObject'=>$objectname
+    );
+
+
+    // Delete some files
+    $filetogenerate = array(
+        'myobject_card.php'=>strtolower($objectname).'_card.php',
+        'myobject_list.php'=>strtolower($objectname).'_list.php',
+        'test/phpunit/MyObjectTest.php'=>'test/phpunit/'.$objectname.'Test.php',
+        'sql/llx_myobject.key.sql'=>'sql/llx_'.strtolower($objectname).'.key.sql',
+        'sql/llx_myobject.sql'=>'sql/llx_'.strtolower($objectname).'.sql',
+        'scripts/myobject.php'=>'scripts/'.strtolower($objectname).'.php',
+        'img/object_myobject.png'=>'img/object_'.strtolower($objectname).'.png',
+        'class/myobject.class.php'=>'class/'.strtolower($objectname).'.class.php',
+        'class/api_myobject.class.php'=>'class/api_'.strtolower($objectname).'.class.php',
+        'class/MyObject.txt'=>'class/'.$objectname.'.txt'
+    );
+
+    foreach($filetogenerate as $srcfile => $destfile)
+    {
+        $result = dol_copy($srcdir.'/'.$srcfile, $destdir.'/'.$destfile);
+        if ($result <= 0)
+        {
+            if ($result < 0)
+            {
+                $error++;
+                $langs->load("errors");
+                setEventMessages($langs->trans("ErrorFailToCopyFile", $srcdir.'/'.$srcfile, $destdir.'/'.$destfile), null, 'errors');
+            }
+            else	// $result == 0
+            {
+                setEventMessages($langs->trans("FileAlreadyExists", $srcdir.'/'.$srcfile, $destdir.'/'.$destfile), null, 'warnings');
+            }
+        }
+        else
+        {
+            // Copy is ok
+        }
+    }
+
+    // Edit PHP files
+    foreach($filetogenerate as $destfile)
+    {
+        $phpfileval['fullname'] = $destdir.'/'.$destfile;
+
+        //var_dump($phpfileval['fullname']);
+        $arrayreplacement=array(
+            'mymodule'=>strtolower($modulename),
+            'MyModule'=>$modulename,
+            'MYMODULE'=>strtoupper($modulename),
+            'My module'=>$modulename,
+            'htdocs/modulebuilder/template/'=>'',
+            'myobject'=>strtolower($objectname),
+            'MyObject'=>$objectname
+        );
+
+        $result=dolReplaceInFile($phpfileval['fullname'], $arrayreplacement);
+        //var_dump($result);
+        if ($result < 0)
+        {
+            setEventMessages($langs->trans("ErrorFailToMakeReplacementInto", $phpfileval['fullname']), null, 'errors');
+        }
+    }
+
+    if (! $error)
+    {
+        setEventMessages('FilesForObjectInitialized', null);
+    }
+}
+
+
 if ($dirins && $action == 'confirm_delete')
 {
     $modulelowercase=strtolower($module);
@@ -485,9 +579,53 @@ elseif (! empty($module))
 
         if ($tab == 'objects')
         {
-    		print $langs->trans("FeatureNotYetAvailable");
 
+            $head3 = array();
+            $h=0;
 
+            $modulelowercase=strtolower($module);
+
+            // Dir for module
+            $dir = $dirins.'/'.$modulelowercase.'/class';
+
+            $head3[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects&module='.$module.'&tabobj=newobject';
+            $head3[$h][1] = $langs->trans("NewObject");
+            $head3[$h][2] = 'newobject';
+            $h++;
+
+            $listofobject = dol_dir_list($dir , 'files', 0, '\.txt$');
+            foreach($listofobject as $fileobj)
+            {
+                $objectname = preg_replace('/\.txt$/', '', $fileobj['name']);
+
+                $head3[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects&module='.$module.'&tabobj='.$objectname;
+                $head3[$h][1] = $objectname;
+                $head3[$h][2] = $objectname;
+                $h++;
+            }
+
+            dol_fiche_head($head3, $tabobj, '', -1, '');
+
+            if ($tabobj == 'newobject')
+            {
+                // New module
+                print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+                print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                print '<input type="hidden" name="action" value="initobject">';
+                print '<input type="hidden" name="tab" value="objects">';
+                print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module).'">';
+
+                print $langs->trans("EnterNameOfObjectDesc").'<br><br>';
+
+                print '<input type="text" name="objectname" value="'.dol_escape_htmltag($modulename).'" placeholder="'.dol_escape_htmltag($langs->trans("ObjectKey")).'">';
+                print '<input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("Create")).'"'.($dirins?'':' disabled="disabled"').'>';
+                print '</form>';
+            }
+
+            if ($tabobj == 'fields')
+            {
+                print $langs->trans("FeatureNotYetAvailable").'<br><br>';
+            }
         }
 
         if ($tab == 'menus')
diff --git a/htdocs/modulebuilder/template/class/MyObject.txt b/htdocs/modulebuilder/template/class/MyObject.txt
new file mode 100644
index 00000000000..37ccaca81ed
--- /dev/null
+++ b/htdocs/modulebuilder/template/class/MyObject.txt
@@ -0,0 +1 @@
+# If this file exists, it means the class and file for object MyOjbect was generated by ModuleBuilder.
\ No newline at end of file
diff --git a/htdocs/modulebuilder/template/class/myobject_api_class.class.php b/htdocs/modulebuilder/template/class/api_myobject.class.php
similarity index 100%
rename from htdocs/modulebuilder/template/class/myobject_api_class.class.php
rename to htdocs/modulebuilder/template/class/api_myobject.class.php
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index f2d4daee8d4..9e66b9410f6 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -31,11 +31,11 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
 //require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 
 /**
- * Class MyModuleObject
+ * Class MyObject
  *
  * Put here description of your class.
  */
-class MyModuleObject extends CommonObject
+class MyObject extends CommonObject
 {
 	/**
 	 * @var string Id to identify managed object
diff --git a/htdocs/modulebuilder/template/img/myobject_mymodule.png b/htdocs/modulebuilder/template/img/object_myobject.png
similarity index 100%
rename from htdocs/modulebuilder/template/img/myobject_mymodule.png
rename to htdocs/modulebuilder/template/img/object_myobject.png