diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index 65e9cc88856..34c2444c07b 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -40,6 +40,7 @@ $cancel = GETPOST('cancel', 'alpha');
 $search_event = GETPOST('search_event', 'alpha');
 
 // Get list of triggers available
+$triggers = array();
 $sql = "SELECT a.rowid, a.code, a.label, a.elementtype, a.rang as position";
 $sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a";
 $sql .= " ORDER BY a.rang ASC";
@@ -169,6 +170,12 @@ if (!empty($triggers))
 		if ($module == 'project') $module = 'projet';
 		if ($module == 'proposal_supplier') $module = 'supplier_proposal';
 
+		// If 'element' value is myobject@mymodule instead of mymodule
+		$tmparray = explode('@', $module);
+		if (! empty($tmparray[1])) {
+			$module = $tmparray[1];
+		}
+
 		//print 'module='.$module.'<br>';
 		if (!empty($conf->$module->enabled))
 		{
diff --git a/htdocs/install/mysql/migration/10.0.0-11.0.0.sql b/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
index 5d31d3de9dc..e35be192bd5 100644
--- a/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
+++ b/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
@@ -59,6 +59,8 @@ ALTER TABLE llx_emailcollector_emailcollectoraction ADD COLUMN position integer
 
 -- For v11
 
+ALTER TABLE llx_c_action_trigger MODIFY COLUMN elementtype varchar(64) NOT NULL;
+
 ALTER TABLE llx_societe_account ADD COLUMN site_account varchar(128);
 
 UPDATE llx_holiday SET ref = rowid WHERE ref IS NULL;
diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.sql
index 647e10adcc4..c29f13b9fd4 100644
--- a/htdocs/install/mysql/tables/llx_c_action_trigger.sql
+++ b/htdocs/install/mysql/tables/llx_c_action_trigger.sql
@@ -22,7 +22,7 @@
 create table llx_c_action_trigger
 (
   rowid			integer AUTO_INCREMENT PRIMARY KEY,
-  elementtype	varchar(32) 			NOT NULL,
+  elementtype	varchar(64) 			NOT NULL,
   code			varchar(32)				NOT NULL,
   label			varchar(128)			NOT NULL,
   description	varchar(255),
diff --git a/htdocs/modulebuilder/template/sql/data.sql b/htdocs/modulebuilder/template/sql/data.sql
index 3d2c8fb05fb..37860e8bf7b 100644
--- a/htdocs/modulebuilder/template/sql/data.sql
+++ b/htdocs/modulebuilder/template/sql/data.sql
@@ -13,6 +13,20 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-INSERT INTO llx_mymodule_myobject VALUES (
-	1, 1, 'mydata'
-);
+
+-- delete from llx_mymodule_myobject;
+--INSERT INTO llx_mymodule_myobject VALUES (1, 1, 'mydata');
+
+
+-- delete from llx_c_mydictionarytabme;
+--INSERT INTO llx_c_mydictionarytabme (code,label,active) VALUES ('ABC', 'Label ABC',   1);
+--INSERT INTO llx_c_mydictionarytabme (code,label,active) VALUES ('DEF', 'Label DEF', 1);
+
+
+-- new types of automatic events to record in agenda
+-- 'code' must be a value matching 'MYOBJECT_ACTION'
+-- 'elementtype' must be value 'mymodule' ('myobject@mymodule' may be possible but should not be required)
+--insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MYOBJECT_VALIDATE','MyObject validated','Executed when myobject is validated', 'mymodule', 1000);
+--insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MYOBJECT_UNVALIDATE','MyObject unvalidated','Executed when myobject is unvalidated', 'mymodule', 1001);
+--insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MYOBJECT_DELETE','MyObject deleted','Executed when myobject deleted', 'mymodule', 1004);
+