@@ -102,7 +102,7 @@ |
||
102 | 102 | |
103 | 103 | // Menus |
104 | 104 | //------ |
105 | - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
105 | + $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
106 | 106 | |
107 | 107 | $this->menu[$r] = array( |
108 | 108 | 'fk_menu' => 0, |
@@ -176,7 +176,7 @@ |
||
176 | 176 | $maxfilesizearray = getMaxFileSizeArray(); |
177 | 177 | $maxmin = $maxfilesizearray['maxmin']; |
178 | 178 | if ($maxmin > 0) { |
179 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
179 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
180 | 180 | } |
181 | 181 | $texte .= ' <input type="file" name="uploadfile">'; |
182 | 182 | $texte .= '<input type="hidden" value="EXPEDITION_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |
@@ -838,7 +838,7 @@ |
||
838 | 838 | if ($object->volume_units < 50) { |
839 | 839 | $totalVolumetoshow = showDimensionInBestUnit($object->trueVolume, $object->volume_units, "volume", $outputlangs); |
840 | 840 | } else { |
841 | - $totalVolumetoshow = price($object->trueVolume, 0, $outputlangs, 0, 0) . ' ' . measuringUnitString(0, "volume", $object->volume_units); |
|
841 | + $totalVolumetoshow = price($object->trueVolume, 0, $outputlangs, 0, 0) . ' ' . measuringUnitString(0, "volume", $object->volume_units); |
|
842 | 842 | } |
843 | 843 | } |
844 | 844 |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | // A condition to hide module |
120 | 120 | $this->hidden = false; |
121 | 121 | // List of module class names as string that must be enabled if this module is enabled. Example: array('always'=>array('modModuleToEnable1','modModuleToEnable2'), 'FR'=>array('modModuleToEnableFR'...)) |
122 | - $this->depends = array('modProjet','modCategorie'); |
|
122 | + $this->depends = array('modProjet', 'modCategorie'); |
|
123 | 123 | $this->requiredby = array(); // List of module class names as string to disable if this one is disabled. Example: array('modModuleToDisable1', ...) |
124 | 124 | $this->conflictwith = array(); // List of module class names as string this module is in conflict with. Example: array('modModuleToDisable1', ...) |
125 | 125 | |
@@ -232,82 +232,82 @@ discard block |
||
232 | 232 | /* END MODULEBUILDER TOPMENU */ |
233 | 233 | /* BEGIN MODULEBUILDER LEFTMENU CONFERENCEORBOOTH*/ |
234 | 234 | $this->menu[$r++] = array( |
235 | - 'fk_menu' => 'fk_mainmenu=project', // '' 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 |
|
236 | - 'type' => 'left', // This is a Left menu entry |
|
235 | + 'fk_menu' => 'fk_mainmenu=project', // '' 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 |
|
236 | + 'type' => 'left', // This is a Left menu entry |
|
237 | 237 | 'titre' => 'EventOrganizationMenuLeft', |
238 | 238 | 'prefix' => img_picto('', 'eventorganization', 'class="paddingright pictofixedwidth"'), |
239 | 239 | 'mainmenu' => 'project', |
240 | 240 | 'leftmenu' => 'eventorganization', |
241 | 241 | 'url' => '', |
242 | - 'langs' => 'eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. |
|
242 | + 'langs' => 'eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. |
|
243 | 243 | 'position' => 1000 + $r, |
244 | - 'enabled' => '$conf->eventorganization->enabled', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. |
|
245 | - 'perms' => '$user->rights->eventorganization->read', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules |
|
244 | + 'enabled' => '$conf->eventorganization->enabled', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. |
|
245 | + 'perms' => '$user->rights->eventorganization->read', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules |
|
246 | 246 | 'target' => '', |
247 | - 'user' => 2, // 0=Menu for internal users, 1=external users, 2=both |
|
247 | + 'user' => 2, // 0=Menu for internal users, 1=external users, 2=both |
|
248 | 248 | ); |
249 | 249 | $this->menu[$r++] = array( |
250 | - 'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganization', // '' 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 |
|
251 | - 'type' => 'left', // This is a Left menu entry |
|
250 | + 'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganization', // '' 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 |
|
251 | + 'type' => 'left', // This is a Left menu entry |
|
252 | 252 | 'titre' => 'List', |
253 | 253 | 'url' => '/projet/list.php?search_usage_event_organization=1&search_status=99&mainmenu=project&contextpage=organizedevents', |
254 | - 'langs' => 'eventorganization@eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. |
|
254 | + 'langs' => 'eventorganization@eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. |
|
255 | 255 | 'position' => 1000 + $r, |
256 | - 'enabled' => '$conf->eventorganization->enabled', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. |
|
257 | - 'perms' => '$user->rights->eventorganization->read', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules |
|
256 | + 'enabled' => '$conf->eventorganization->enabled', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. |
|
257 | + 'perms' => '$user->rights->eventorganization->read', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules |
|
258 | 258 | 'target' => '', |
259 | - 'user' => 2, // 0=Menu for internal users, 1=external users, 2=both |
|
259 | + 'user' => 2, // 0=Menu for internal users, 1=external users, 2=both |
|
260 | 260 | ); |
261 | 261 | $this->menu[$r++] = array( |
262 | - 'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganization', // '' 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 |
|
263 | - 'type' => 'left', // This is a Left menu entry |
|
262 | + 'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganization', // '' 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 |
|
263 | + 'type' => 'left', // This is a Left menu entry |
|
264 | 264 | 'titre' => 'New', |
265 | 265 | 'url' => '/projet/card.php?leftmenu=projects&action=create&usage_organize_event=1&usage_opportunity=0', |
266 | - 'langs' => 'eventorganization@eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. |
|
266 | + 'langs' => 'eventorganization@eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. |
|
267 | 267 | 'position' => 1000 + $r, |
268 | - 'enabled' => '$conf->eventorganization->enabled', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. |
|
269 | - 'perms' => '$user->rights->eventorganization->write', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules |
|
268 | + 'enabled' => '$conf->eventorganization->enabled', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. |
|
269 | + 'perms' => '$user->rights->eventorganization->write', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules |
|
270 | 270 | 'target' => '', |
271 | - 'user' => 2, // 0=Menu for internal users, 1=external users, 2=both |
|
271 | + 'user' => 2, // 0=Menu for internal users, 1=external users, 2=both |
|
272 | 272 | ); |
273 | 273 | $this->menu[$r++] = array( |
274 | - 'fk_menu' => 'fk_mainmenu=project', // '' 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 |
|
275 | - 'type' => 'left', // This is a Left menu entry |
|
274 | + 'fk_menu' => 'fk_mainmenu=project', // '' 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 |
|
275 | + 'type' => 'left', // This is a Left menu entry |
|
276 | 276 | 'titre' => 'ConferenceOrBooth', |
277 | 277 | 'prefix' => img_picto('', 'conferenceorbooth', 'class="paddingright pictofixedwidth"'), |
278 | 278 | 'mainmenu' => 'project', |
279 | 279 | 'leftmenu' => 'eventorganizationconforbooth', |
280 | 280 | 'url' => '', |
281 | - 'langs' => 'eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. |
|
281 | + 'langs' => 'eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. |
|
282 | 282 | 'position' => 1000 + $r, |
283 | - 'enabled' => '$conf->eventorganization->enabled', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. |
|
284 | - 'perms' => '$user->rights->eventorganization->read', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules |
|
283 | + 'enabled' => '$conf->eventorganization->enabled', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. |
|
284 | + 'perms' => '$user->rights->eventorganization->read', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules |
|
285 | 285 | 'target' => '', |
286 | - 'user' => 2, // 0=Menu for internal users, 1=external users, 2=both |
|
286 | + 'user' => 2, // 0=Menu for internal users, 1=external users, 2=both |
|
287 | 287 | ); |
288 | 288 | $this->menu[$r++] = array( |
289 | - 'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganizationconforbooth', // '' 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 |
|
290 | - 'type' => 'left', // This is a Left menu entry |
|
289 | + 'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganizationconforbooth', // '' 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 |
|
290 | + 'type' => 'left', // This is a Left menu entry |
|
291 | 291 | 'titre' => 'List', |
292 | 292 | 'url' => '/eventorganization/conferenceorbooth_list.php?mainmenu=project', |
293 | - 'langs' => 'eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. |
|
293 | + 'langs' => 'eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. |
|
294 | 294 | 'position' => 1000 + $r, |
295 | - 'enabled' => '$conf->eventorganization->enabled', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. |
|
296 | - 'perms' => '$user->rights->eventorganization->read', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules |
|
295 | + 'enabled' => '$conf->eventorganization->enabled', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. |
|
296 | + 'perms' => '$user->rights->eventorganization->read', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules |
|
297 | 297 | 'target' => '', |
298 | - 'user' => 2, // 0=Menu for internal users, 1=external users, 2=both |
|
298 | + 'user' => 2, // 0=Menu for internal users, 1=external users, 2=both |
|
299 | 299 | ); |
300 | 300 | $this->menu[$r++] = array( |
301 | - 'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganizationconforbooth', // '' 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 |
|
302 | - 'type' => 'left', // This is a Left menu entry |
|
301 | + 'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganizationconforbooth', // '' 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 |
|
302 | + 'type' => 'left', // This is a Left menu entry |
|
303 | 303 | 'titre' => 'New', |
304 | 304 | 'url' => '/eventorganization/conferenceorbooth_card.php?leftmenu=projects&action=create', |
305 | - 'langs' => 'eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. |
|
305 | + 'langs' => 'eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. |
|
306 | 306 | 'position' => 1000 + $r, |
307 | - 'enabled' => '$conf->eventorganization->enabled', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. |
|
308 | - 'perms' => '$user->rights->eventorganization->write', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules |
|
307 | + 'enabled' => '$conf->eventorganization->enabled', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. |
|
308 | + 'perms' => '$user->rights->eventorganization->write', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules |
|
309 | 309 | 'target' => '', |
310 | - 'user' => 2, // 0=Menu for internal users, 1=external users, 2=both |
|
310 | + 'user' => 2, // 0=Menu for internal users, 1=external users, 2=both |
|
311 | 311 | ); |
312 | 312 | /* END MODULEBUILDER LEFTMENU CONFERENCEORBOOTH */ |
313 | 313 | |
@@ -325,8 +325,8 @@ discard block |
||
325 | 325 | $keyforelement = 'conferenceorboothattendee'; |
326 | 326 | include DOL_DOCUMENT_ROOT . '/core/commonfieldsinexport.inc.php'; |
327 | 327 | $this->export_entities_array[$r]['t.fk_invoice'] = 'invoice'; |
328 | - unset($this->export_fields_array[$r]['t.fk_project']); // Remove field so we can add it at end just after |
|
329 | - unset($this->export_fields_array[$r]['t.fk_soc']); // Remove field so we can add it at end just after |
|
328 | + unset($this->export_fields_array[$r]['t.fk_project']); // Remove field so we can add it at end just after |
|
329 | + unset($this->export_fields_array[$r]['t.fk_soc']); // Remove field so we can add it at end just after |
|
330 | 330 | $this->export_fields_array[$r]['t.fk_invoice'] = 'InvoiceId'; |
331 | 331 | $this->export_fields_array[$r]['t.fk_project'] = 'ProjectId'; |
332 | 332 | $this->export_fields_array[$r]['p.ref'] = 'ProjectRef'; |
@@ -342,7 +342,7 @@ discard block |
||
342 | 342 | //unset($this->export_fields_array[$r]['t.fieldtoremove']); |
343 | 343 | $keyforselect = 'conferenceorboothattendee'; |
344 | 344 | $keyforaliasextra = 'extra'; |
345 | - $keyforelement = 'conferenceorboothattendee'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
345 | + $keyforelement = 'conferenceorboothattendee'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
346 | 346 | include DOL_DOCUMENT_ROOT . '/core/extrafieldsinexport.inc.php'; |
347 | 347 | //$this->export_dependencies_array[$r] = array('aaaline'=>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) |
348 | 348 | //$this->export_special_array[$r] = array('t.field'=>'...'); |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | $this->depends = array(); // List of module class names as string that must be enabled if this module is enabled |
75 | 75 | $this->requiredby = array(); // List of module ids to disable if this one is disabled |
76 | 76 | $this->conflictwith = array(); // List of module class names as string this module is in conflict with |
77 | - $this->langfiles = array("companies","project"); |
|
77 | + $this->langfiles = array("companies", "project"); |
|
78 | 78 | $this->phpmin = array(7, 0); // Minimum version of PHP required by module |
79 | 79 | |
80 | 80 | // Module parts |
@@ -435,7 +435,7 @@ discard block |
||
435 | 435 | $this->export_code[$r] = $this->rights_class . '_' . $r; |
436 | 436 | $this->export_label[$r] = "ExportDataset_event1"; |
437 | 437 | $this->export_permission[$r] = array(array("agenda", "export")); |
438 | - $this->export_fields_array[$r] = array('ac.id' => "IdAgenda", 'ac.ref_ext' => "ExternalRef",'ac.ref' => "Ref", 'ac.datec' => "DateCreation", 'ac.datep' => "DateActionBegin", |
|
438 | + $this->export_fields_array[$r] = array('ac.id' => "IdAgenda", 'ac.ref_ext' => "ExternalRef", 'ac.ref' => "Ref", 'ac.datec' => "DateCreation", 'ac.datep' => "DateActionBegin", |
|
439 | 439 | 'ac.datep2' => "DateActionEnd", 'ac.location' => 'Location', 'ac.label' => "Title", 'ac.note' => "Note", 'ac.percent' => "Percentage", 'ac.durationp' => "Duration", |
440 | 440 | 'ac.fk_user_author' => 'CreatedById', 'ac.fk_user_action' => 'ActionsOwnedBy', 'ac.fk_user_mod' => 'ModifiedBy', 'ac.transparency' => "Transparency", 'ac.priority' => "Priority", 'ac.fk_element' => "ElementID", 'ac.elementtype' => "ElementType", |
441 | 441 | 'cac.libelle' => "ActionType", 'cac.code' => "Code", |
@@ -453,7 +453,7 @@ discard block |
||
453 | 453 | } |
454 | 454 | $this->export_TypeFields_array[$r] = array('ac.ref_ext' => "Text", 'ac.ref' => "Text", 'ac.datec' => "Date", 'ac.datep' => "Date", |
455 | 455 | 'ac.datep2' => "Date", 'ac.location' => 'Text', 'ac.label' => "Text", 'ac.note' => "Text", 'ac.percent' => "Numeric", |
456 | - 'ac.durationp' => "Duree",'ac.fk_user_author' => 'Numeric', 'ac.fk_user_action' => 'Numeric', 'ac.fk_user_mod' => 'Numeric', 'ac.transparency' => "Numeric", 'ac.priority' => "Numeric", 'ac.fk_element' => "Numeric", 'ac.elementtype' => "Text", |
|
456 | + 'ac.durationp' => "Duree", 'ac.fk_user_author' => 'Numeric', 'ac.fk_user_action' => 'Numeric', 'ac.fk_user_mod' => 'Numeric', 'ac.transparency' => "Numeric", 'ac.priority' => "Numeric", 'ac.fk_element' => "Numeric", 'ac.elementtype' => "Text", |
|
457 | 457 | 'cac.libelle' => "List:c_actioncomm:libelle:libelle", 'cac.code' => "Text", |
458 | 458 | 's.nom' => 'Text', 's.address' => 'Text', 's.zip' => 'Text', 's.town' => 'Text', |
459 | 459 | 'co.code' => 'Text', 's.phone' => 'Text', 's.siren' => 'Text', 's.siret' => 'Text', 's.ape' => 'Text', 's.idprof4' => 'Text', 's.idprof5' => 'Text', 's.idprof6' => 'Text', |
@@ -462,7 +462,7 @@ discard block |
||
462 | 462 | |
463 | 463 | ); |
464 | 464 | $this->export_entities_array[$r] = array('ac.id' => "action", 'ac.ref_ext' => "action", 'ac.ref' => "action", 'ac.datec' => "action", 'ac.datep' => "action", |
465 | - 'ac.datep2' => "action", 'ac.location' => 'action', 'ac.label' => "action", 'ac.note' => "action", 'ac.percent' => "action", 'ac.durationp' => "action",'ac.fk_user_author' => 'user', 'ac.fk_user_action' => 'user', 'ac.fk_user_mod' => 'user', 'ac.transparency' => "action", 'ac.priority' => "action", 'ac.fk_element' => "action", 'ac.elementtype' => "action", |
|
465 | + 'ac.datep2' => "action", 'ac.location' => 'action', 'ac.label' => "action", 'ac.note' => "action", 'ac.percent' => "action", 'ac.durationp' => "action", 'ac.fk_user_author' => 'user', 'ac.fk_user_action' => 'user', 'ac.fk_user_mod' => 'user', 'ac.transparency' => "action", 'ac.priority' => "action", 'ac.fk_element' => "action", 'ac.elementtype' => "action", |
|
466 | 466 | 's.rowid' => "company", 's.nom' => 'company', 's.address' => 'company', 's.zip' => 'company', 's.town' => 'company', |
467 | 467 | 'co.code' => 'company', 's.phone' => 'company', 's.siren' => 'company', 's.siret' => 'company', 's.ape' => 'company', 's.idprof4' => 'company', 's.idprof5' => 'company', 's.idprof6' => 'company', |
468 | 468 | 's.code_compta' => 'company', 's.code_compta_fournisseur' => 'company', 's.tva_intra' => 'company', |
@@ -581,9 +581,9 @@ discard block |
||
581 | 581 | ); |
582 | 582 | |
583 | 583 | // Import Event Extra Fields |
584 | - $keyforselect = 'actioncomm'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
585 | - $keyforelement = 'action'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
586 | - $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
584 | + $keyforselect = 'actioncomm'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
585 | + $keyforelement = 'action'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
586 | + $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
587 | 587 | include DOL_DOCUMENT_ROOT . '/core/extrafieldsinexport.inc.php'; |
588 | 588 | } |
589 | 589 | } |
@@ -110,7 +110,7 @@ |
||
110 | 110 | $r++;*/ |
111 | 111 | |
112 | 112 | // Main menu entries |
113 | - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
113 | + $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
114 | 114 | $this->menu[$r] = array( |
115 | 115 | 'fk_menu' => '0', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode |
116 | 116 | 'type' => 'top', // This is a Left menu entry |
@@ -104,12 +104,12 @@ |
||
104 | 104 | |
105 | 105 | // Permissions |
106 | 106 | $this->rights = array(); // Permission array used by this module |
107 | - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
107 | + $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
108 | 108 | |
109 | 109 | |
110 | 110 | // Main menu entries |
111 | 111 | $this->menu = array(); // List of menus to add |
112 | - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
112 | + $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
113 | 113 | /*$this->menu[$r]=array( |
114 | 114 | 'fk_menu'=>'fk_mainmenu=billing,fk_leftmenu=customers_bills_payment', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode |
115 | 115 | 'mainmenu'=>'billing', |
@@ -250,7 +250,7 @@ |
||
250 | 250 | |
251 | 251 | // Show notes |
252 | 252 | if (!empty($object->note_public)) { |
253 | - $tab_top = 65; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
253 | + $tab_top = 65; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
254 | 254 | |
255 | 255 | $pdf->SetFont('', 'B', $default_font_size); |
256 | 256 | $pdf->MultiCell(190, 4, $outputlangs->transnoentities("Notes") . ":", 0, 'L', 0, '', 12, $tab_top); |
@@ -167,7 +167,7 @@ |
||
167 | 167 | $maxfilesizearray = getMaxFileSizeArray(); |
168 | 168 | $maxmin = $maxfilesizearray['maxmin']; |
169 | 169 | if ($maxmin > 0) { |
170 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
170 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
171 | 171 | } |
172 | 172 | $texte .= ' <input type="file" name="uploadfile">'; |
173 | 173 | $texte .= '<input type="hidden" value="MEMBER_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |