szollosil 1 år sedan
förälder
incheckning
4983ba80a5

+ 10 - 9
comm/action/card.php

@@ -1691,6 +1691,7 @@ if ($id > 0) {
 		$object->usermod = $tmpuser;
 	}
 
+	$isACEVENTObj = $object->code == 'AC_EVENT';
 
 	/*
 	 * Show tabs
@@ -1955,7 +1956,7 @@ if ($id > 0) {
 
 		print '<table class="border tableforfield centpercent">';
 
-		if (isModEnabled("societe")) {
+		if (isModEnabled("societe") && !$isACEVENTObj) {
 			// Related company
 			print '<tr><td class="titlefieldcreate">' . $langs->trans("ActionOnCompany") . '</td>';
 			print '<td>';
@@ -2038,12 +2039,14 @@ if ($id > 0) {
 		}
 
 		// Description
-		print '<tr><td class="tdtop">' . $langs->trans("Description") . '</td><td>';
-		// Editeur wysiwyg
-		require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
-		$doleditor = new DolEditor('note', $object->note_private, '', 120, 'dolibarr_notes', 'In', true, true, $conf->fckeditor->enabled, ROWS_4, '90%');
-		$doleditor->Create();
-		print '</td></tr>';
+		if (!$isACEVENTObj) {
+			print '<tr><td class="tdtop">' . $langs->trans("Description") . '</td><td>';
+			// Editeur wysiwyg
+			require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+			$doleditor = new DolEditor('note', $object->note_private, '', 120, 'dolibarr_notes', 'In', true, true, $conf->fckeditor->enabled, ROWS_4, '90%');
+			$doleditor->Create();
+			print '</td></tr>';
+		}
 
 		// Other attributes
 		$parameters = array();
@@ -2290,8 +2293,6 @@ if ($id > 0) {
 		}
 		print '</td></tr>';
 
-		$isACEVENTObj = $object->code == 'AC_EVENT';
-
 		// Location
 		if (empty($conf->global->AGENDA_DISABLE_LOCATION) && !$isACEVENTObj) {
 			print '<tr><td>' . $langs->trans("Location") . '</td><td>' . $object->location . '</td></tr>';

+ 3 - 0
core/class/commonobject.class.php

@@ -8402,7 +8402,10 @@ abstract class CommonObject
 									$entrepotObj->fetch($_REQUEST['inventory_id']);
 									if ($entrepotObj->array_options['options_entrepot_type'] == 2) {
 										$out .= $extrafields->showInputField($key, $value, '', $keysuffix, '', 0, $this->id, $this->table_element);
+								
 									}
+								} elseif($key == 'participants') {
+									$out .= $value;
 								} elseif($key == 'device_type') {
 									$entrepotObj = new Entrepot($this->db);
 									$entrepotObj->fetch($_REQUEST['inventory_id']);

+ 1 - 1
custom/bbus/core/modules/modBBus.class.php

@@ -313,7 +313,7 @@ class modBBus extends DolibarrModules
 		$this->menu[$r++] = array(
 			'fk_menu'=>'', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 			'type'=>'top', // This is a Top menu entry
-			'titre'=>'ModuleBBusName',
+			'titre'=>'Operation',
 			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth valignmiddle"'),
 			'mainmenu'=>'bbus',
 			'leftmenu'=>'',

+ 2 - 1
custom/bbus/langs/en_US/bbus.lang

@@ -115,4 +115,5 @@ PrintingDate=Printing date
 PrintingUser=Printing user
 validated_at=Validated at
 expire_at=Expire at
-available_at=Available at
+available_at=Available at
+Operation=Operation

+ 2 - 1
custom/bbus/langs/hu_HU/bbus.lang

@@ -116,4 +116,5 @@ PrintingDate=Nyomtatás dátuma
 PrintingUser=Nyomtatta
 validated_at=Érvényesség kezdete
 expire_at=Érvényesség vége
-available_at=Felhasználhatóság dátuma
+available_at=Felhasználhatóság dátuma
+Operation = Művelet