Passed
Push — master ( b51057...d63371 )
by
unknown
02:04
created
lib/subtotal.lib.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -41,21 +41,21 @@  discard block
 block discarded – undo
41 41
     $head[$h][2] = 'about';
42 42
     $h++;
43 43
 
44
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'subtotal', $showLabel=false);
44
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'subtotal', $showLabel = false);
45 45
 
46 46
     return $head;
47 47
 }
48 48
 
49
-function getHtmlSelectTitle(&$object, $showLabel=false)
49
+function getHtmlSelectTitle(&$object, $showLabel = false)
50 50
 {
51 51
 	global $langs;
52 52
 	
53
-	require_once DOL_DOCUMENT_ROOT . '/core/lib/functions.lib.php';
53
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
54 54
 	dol_include_once('/subtotal/class/subtotal.class.php');
55 55
 	$TTitle = TSubtotal::getAllTitleFromDocument($object);
56 56
 	$html = '';
57
-	if ($showLabel) $html.= '<label for="under_title">'.$langs->trans('subtotalLabelForUnderTitle').'</label>';
58
-	$html.= '<select onChange="$(\'select[name=under_title]\').val(this.value);" name="under_title" class="under_title minwidth200"><option value="-1"></option>';
57
+	if ($showLabel) $html .= '<label for="under_title">'.$langs->trans('subtotalLabelForUnderTitle').'</label>';
58
+	$html .= '<select onChange="$(\'select[name=under_title]\').val(this.value);" name="under_title" class="under_title minwidth200"><option value="-1"></option>';
59 59
 	
60 60
 	$nbsp = '&nbsp;';
61 61
 	foreach ($TTitle as &$line)
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 
71 71
 function getTFreeText()
72 72
 {
73
-	global $db,$conf;
73
+	global $db, $conf;
74 74
 	
75 75
 	$TFreeText = array();
76 76
 	
@@ -88,19 +88,19 @@  discard block
 block discarded – undo
88 88
 	return $TFreeText;
89 89
 }
90 90
 
91
-function getHtmlSelectFreeText($withEmpty=true)
91
+function getHtmlSelectFreeText($withEmpty = true)
92 92
 {
93 93
 	global $langs;
94 94
 	
95 95
 	$TFreeText = getTFreeText();
96 96
 	$html = '<label for="free_text">'.$langs->trans('subtotalLabelForFreeText').'</label>';
97
-	$html.= '<select onChange="getTFreeText($(this));" name="free_text" class="minwidth200">';
98
-	if ($withEmpty) $html.= '<option value=""></option>';
97
+	$html .= '<select onChange="getTFreeText($(this));" name="free_text" class="minwidth200">';
98
+	if ($withEmpty) $html .= '<option value=""></option>';
99 99
 
100 100
 	$TFreeTextContents = array();
101 101
 	foreach ($TFreeText as $id => $tab)
102 102
 	{
103
-		$html.= '<option value="'.$id.'">'.$tab->label.'</option>';
103
+		$html .= '<option value="'.$id.'">'.$tab->label.'</option>';
104 104
 		$TFreeTextContents[$id] = $tab->content;
105 105
 	}
106 106
 
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 function _updateSubtotalLine(&$object, &$line)
129 129
 {
130 130
 	$label = GETPOST('line-title');
131
-	$description = ($line->qty>90) ? '' : GETPOST('line-description');
131
+	$description = ($line->qty > 90) ? '' : GETPOST('line-description');
132 132
 	$pagebreak = (int) GETPOST('line-pagebreak');
133 133
 
134 134
 	$level = GETPOST('subtotal_level', 'int');
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
 
146 146
 function _updateSubtotalBloc($object, $line)
147 147
 {
148
-	global $conf,$langs;
148
+	global $conf, $langs;
149 149
 	
150 150
 	$subtotal_tva_tx = $subtotal_tva_tx_init = GETPOST('subtotal_tva_tx', 'int');
151 151
 	$subtotal_progress = $subtotal_progress_init = GETPOST('subtotal_progress', 'int');
@@ -224,9 +224,9 @@  discard block
 block discarded – undo
224 224
  * @param	$lineid			= title lineid
225 225
  * @param	$subtotal_nc	0 = "Compris" prise en compte des totaux des lignes; 1 = "Non compris" non prise en compte des totaux du bloc; null = update de toutes les lignes 
226 226
  */
227
-function _updateLineNC($element, $elementid, $lineid, $subtotal_nc=null)
227
+function _updateLineNC($element, $elementid, $lineid, $subtotal_nc = null)
228 228
 {
229
-	global $db,$langs,$tmp_object_nc;
229
+	global $db, $langs, $tmp_object_nc;
230 230
 	
231 231
 	$error = 0;
232 232
 	if (empty($element)) $error++;
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
 	{
267 267
 		foreach ($object->lines as &$l)
268 268
 		{
269
-			if($l->id == $lineid) {
269
+			if ($l->id == $lineid) {
270 270
 				$line = $l;
271 271
 				break;
272 272
 			}
@@ -276,12 +276,12 @@  discard block
 block discarded – undo
276 276
 		{
277 277
 			$db->begin();
278 278
 			
279
-			if(TSubtotal::isModSubtotalLine($line))
279
+			if (TSubtotal::isModSubtotalLine($line))
280 280
 			{
281
-				if(TSubtotal::isTitle($line)) {
281
+				if (TSubtotal::isTitle($line)) {
282 282
 					// Update le contenu du titre (ainsi que le titre lui même)
283 283
 					$TTitleBlock = TSubtotal::getLinesFromTitleId($object, $lineid, true);
284
-					foreach($TTitleBlock as &$line_block)
284
+					foreach ($TTitleBlock as &$line_block)
285 285
 					{
286 286
 						$res = doUpdate($object, $line_block, $subtotal_nc);
287 287
 					}
@@ -315,7 +315,7 @@  discard block
 block discarded – undo
315 315
     
316 316
 	if (TSubtotal::isFreeText($line) || TSubtotal::isSubtotal($line)) return 1;
317 317
 	// Update extrafield et total
318
-	if(! empty($subtotal_nc)) {
318
+	if (!empty($subtotal_nc)) {
319 319
 		$line->total_ht = $line->total_tva = $line->total_ttc = $line->total_localtax1 = $line->total_localtax2 = 
320 320
 			$line->multicurrency_total_ht = $line->multicurrency_total_tva = $line->multicurrency_total_ttc = 0;
321 321
 
Please login to merge, or discard this patch.
core/triggers/interface_90_modSubtotal_subtotaltrigger.class.php 1 patch
Spacing   +106 added lines, -106 removed lines patch added patch discarded remove patch
@@ -107,13 +107,13 @@  discard block
 block discarded – undo
107 107
 			if ($object->id != $line->id && $line->rang > $rang)
108 108
 			{
109 109
 				// Update du rang de toutes les lignes suivant mon titre
110
-				$parent->updateRangOfLine($line->id, $line->rang+1);
110
+				$parent->updateRangOfLine($line->id, $line->rang + 1);
111 111
 			}
112 112
 		}
113 113
 		
114 114
 		// Update du rang de la ligne fraichement ajouté pour la déplacer sous mon titre
115
-		$parent->updateRangOfLine($object->id, $rang+1);
116
-		$object->rang = $rang+1;
115
+		$parent->updateRangOfLine($object->id, $rang + 1);
116
+		$object->rang = $rang + 1;
117 117
 	}
118 118
 	
119 119
 	public function addToEnd(&$parent, &$object, $rang)
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
 			
137 137
 			if ($subtotal_line_found)
138 138
 			{
139
-				$parent->updateRangOfLine($line->id, $line->rang+1);
139
+				$parent->updateRangOfLine($line->id, $line->rang + 1);
140 140
 			}
141 141
 		}
142 142
 		
@@ -257,10 +257,10 @@  discard block
 block discarded – undo
257 257
 		{
258 258
 			$doli_action = GETPOST('action');
259 259
 			$set = GETPOST('set');
260
-			if ( (in_array($doli_action, array('updateligne', 'updateline', 'addline', 'add')) || $set == 'defaultTVA') && !TSubtotal::isTitle($object) && !TSubtotal::isSubtotal($object) && in_array($object->element, array('propaldet', 'commandedet', 'facturedet')))
260
+			if ((in_array($doli_action, array('updateligne', 'updateline', 'addline', 'add')) || $set == 'defaultTVA') && !TSubtotal::isTitle($object) && !TSubtotal::isSubtotal($object) && in_array($object->element, array('propaldet', 'commandedet', 'facturedet')))
261 261
 			{
262 262
 				 dol_syslog(
263
-					"[SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS] Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". object=".$object->element." id=" . $object->id
263
+					"[SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS] Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". object=".$object->element." id=".$object->id
264 264
 				);
265 265
 				 
266 266
 				$TTitle = TSubtotal::getAllTitleFromLine($object);
@@ -280,7 +280,7 @@  discard block
 block discarded – undo
280 280
 				}
281 281
 
282 282
 				// $object correspond à la ligne ajoutée
283
-				if(! empty($object->array_options['options_subtotal_nc'])) {
283
+				if (!empty($object->array_options['options_subtotal_nc'])) {
284 284
 					$object->total_ht = $object->total_tva = $object->total_ttc = $object->total_localtax1 = $object->total_localtax2 = 
285 285
 							$object->multicurrency_total_ht = $object->multicurrency_total_tva = $object->multicurrency_total_ttc = 0;
286 286
 
@@ -294,12 +294,12 @@  discard block
 block discarded – undo
294 294
 		
295 295
 		// Les lignes libres (y compris les sous-totaux) créées à partir d'une facture modèle n'ont pas la TVA de la ligne du modèle mais la TVA par défaut
296 296
 		if ($action == 'BILL_CREATE' && $object->fac_rec > 0) {
297
-			dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
297
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
298 298
 
299 299
 			$object->fetch_lines(); // Lignes pas rajoutées à $object->lines par les appels à addline();
300 300
 
301
-			foreach($object->lines as &$line) {
302
-				if(TSubtotal::isSubtotal($line) && ! empty($line->tva_tx)) {
301
+			foreach ($object->lines as &$line) {
302
+				if (TSubtotal::isSubtotal($line) && !empty($line->tva_tx)) {
303 303
 					$line->tva_tx = 0;
304 304
 					$line->update();
305 305
 				}
@@ -309,170 +309,170 @@  discard block
 block discarded – undo
309 309
         
310 310
         if ($action == 'USER_LOGIN') {
311 311
             dol_syslog(
312
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
312
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
313 313
             );
314 314
         } elseif ($action == 'USER_UPDATE_SESSION') {
315 315
             // Warning: To increase performances, this action is triggered only if
316 316
             // constant MAIN_ACTIVATE_UPDATESESSIONTRIGGER is set to 1.
317 317
             dol_syslog(
318
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
318
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
319 319
             );
320 320
         } elseif ($action == 'USER_CREATE') {
321 321
             dol_syslog(
322
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
322
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
323 323
             );
324 324
         } elseif ($action == 'USER_CREATE_FROM_CONTACT') {
325 325
             dol_syslog(
326
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
326
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
327 327
             );
328 328
         } elseif ($action == 'USER_MODIFY') {
329 329
             dol_syslog(
330
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
330
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
331 331
             );
332 332
         } elseif ($action == 'USER_NEW_PASSWORD') {
333 333
             dol_syslog(
334
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
334
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
335 335
             );
336 336
         } elseif ($action == 'USER_ENABLEDISABLE') {
337 337
             dol_syslog(
338
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
338
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
339 339
             );
340 340
         } elseif ($action == 'USER_DELETE') {
341 341
             dol_syslog(
342
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
342
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
343 343
             );
344 344
         } elseif ($action == 'USER_LOGOUT') {
345 345
             dol_syslog(
346
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
346
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
347 347
             );
348 348
         } elseif ($action == 'USER_SETINGROUP') {
349 349
             dol_syslog(
350
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
350
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
351 351
             );
352 352
         } elseif ($action == 'USER_REMOVEFROMGROUP') {
353 353
             dol_syslog(
354
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
354
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
355 355
             );
356 356
         }
357 357
 
358 358
         // Groups
359 359
         elseif ($action == 'GROUP_CREATE') {
360 360
             dol_syslog(
361
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
361
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
362 362
             );
363 363
         } elseif ($action == 'GROUP_MODIFY') {
364 364
             dol_syslog(
365
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
365
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
366 366
             );
367 367
         } elseif ($action == 'GROUP_DELETE') {
368 368
             dol_syslog(
369
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
369
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
370 370
             );
371 371
         }
372 372
 
373 373
         // Companies
374 374
         elseif ($action == 'COMPANY_CREATE') {
375 375
             dol_syslog(
376
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
376
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
377 377
             );
378 378
         } elseif ($action == 'COMPANY_MODIFY') {
379 379
             dol_syslog(
380
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
380
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
381 381
             );
382 382
         } elseif ($action == 'COMPANY_DELETE') {
383 383
             dol_syslog(
384
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
384
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
385 385
             );
386 386
         }
387 387
 
388 388
         // Contacts
389 389
         elseif ($action == 'CONTACT_CREATE') {
390 390
             dol_syslog(
391
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
391
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
392 392
             );
393 393
         } elseif ($action == 'CONTACT_MODIFY') {
394 394
             dol_syslog(
395
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
395
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
396 396
             );
397 397
         } elseif ($action == 'CONTACT_DELETE') {
398 398
             dol_syslog(
399
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
399
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
400 400
             );
401 401
         }
402 402
 
403 403
         // Products
404 404
         elseif ($action == 'PRODUCT_CREATE') {
405 405
             dol_syslog(
406
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
406
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
407 407
             );
408 408
         } elseif ($action == 'PRODUCT_MODIFY') {
409 409
             dol_syslog(
410
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
410
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
411 411
             );
412 412
         } elseif ($action == 'PRODUCT_DELETE') {
413 413
             dol_syslog(
414
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
414
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
415 415
             );
416 416
         }
417 417
 
418 418
         // Customer orders
419 419
         elseif ($action == 'ORDER_CREATE') {
420 420
             dol_syslog(
421
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
421
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
422 422
             );
423 423
         } elseif ($action == 'ORDER_VALIDATE') {
424 424
             dol_syslog(
425
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
425
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
426 426
             );
427 427
         } elseif ($action == 'ORDER_DELETE') {
428 428
             dol_syslog(
429
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
429
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
430 430
             );
431 431
         } elseif ($action == 'ORDER_BUILDDOC') {
432 432
             dol_syslog(
433
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
433
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
434 434
             );
435 435
         } elseif ($action == 'ORDER_SENTBYMAIL') {
436 436
             dol_syslog(
437
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
437
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
438 438
             );
439 439
         } elseif ($action == 'LINEORDER_INSERT') {
440 440
             dol_syslog(
441
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
441
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
442 442
             );
443 443
         } elseif ($action == 'LINEORDER_DELETE') {
444 444
             dol_syslog(
445
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
445
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
446 446
             );
447 447
         }
448 448
 
449 449
         // Supplier orders
450 450
         elseif ($action == 'ORDER_SUPPLIER_CREATE') {
451 451
             dol_syslog(
452
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
452
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
453 453
             );
454 454
         } elseif ($action == 'ORDER_SUPPLIER_VALIDATE') {
455 455
             dol_syslog(
456
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
456
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
457 457
             );
458 458
         } elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL') {
459 459
             dol_syslog(
460
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
460
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
461 461
             );
462 462
         } elseif ($action == 'SUPPLIER_ORDER_BUILDDOC') {
463 463
             dol_syslog(
464
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
464
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
465 465
             );
466 466
         }
467 467
 
468 468
         // Proposals
469 469
         elseif ($action == 'PROPAL_CREATE') {
470 470
             dol_syslog(
471
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
471
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
472 472
             );
473 473
         } elseif (in_array($action, array('PROPAL_CLONE', 'ORDER_CLONE', 'BILL_CLONE'))) {
474 474
             dol_syslog(
475
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
475
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
476 476
             );
477 477
 			
478 478
 			$doli_action = GETPOST('action');
@@ -480,7 +480,7 @@  discard block
 block discarded – undo
480 480
 			if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && in_array($doli_action, array('confirm_clone')))
481 481
 			{
482 482
 				dol_syslog(
483
-					"[SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS] Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". object=".$object->element." id=" . $object->id
483
+					"[SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS] Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". object=".$object->element." id=".$object->id
484 484
 				);
485 485
 				
486 486
 				// En fonction de l'objet et de la version, les lignes conservent l'id de l'objet d'origine
@@ -508,272 +508,272 @@  discard block
 block discarded – undo
508 508
 			
509 509
         } elseif ($action == 'PROPAL_MODIFY') {
510 510
             dol_syslog(
511
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
511
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
512 512
             );
513 513
         } elseif ($action == 'PROPAL_VALIDATE') {
514 514
             dol_syslog(
515
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
515
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
516 516
             );
517 517
         } elseif ($action == 'PROPAL_BUILDDOC') {
518 518
             dol_syslog(
519
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
519
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
520 520
             );
521 521
         } elseif ($action == 'PROPAL_SENTBYMAIL') {
522 522
             dol_syslog(
523
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
523
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
524 524
             );
525 525
         } elseif ($action == 'PROPAL_CLOSE_SIGNED') {
526 526
             dol_syslog(
527
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
527
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
528 528
             );
529 529
         } elseif ($action == 'PROPAL_CLOSE_REFUSED') {
530 530
             dol_syslog(
531
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
531
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
532 532
             );
533 533
         } elseif ($action == 'PROPAL_DELETE') {
534 534
             dol_syslog(
535
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
535
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
536 536
             );
537 537
         } elseif ($action == 'LINEPROPAL_INSERT') {
538 538
             dol_syslog(
539
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
539
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
540 540
             );
541 541
         } elseif ($action == 'LINEPROPAL_MODIFY') {
542 542
             dol_syslog(
543
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
543
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
544 544
             );
545 545
         } elseif ($action == 'LINEPROPAL_DELETE') {
546 546
             dol_syslog(
547
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
547
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
548 548
             );
549 549
         }
550 550
 
551 551
         // Contracts
552 552
         elseif ($action == 'CONTRACT_CREATE') {
553 553
             dol_syslog(
554
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
554
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
555 555
             );
556 556
         } elseif ($action == 'CONTRACT_MODIFY') {
557 557
             dol_syslog(
558
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
558
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
559 559
             );
560 560
         } elseif ($action == 'CONTRACT_ACTIVATE') {
561 561
             dol_syslog(
562
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
562
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
563 563
             );
564 564
         } elseif ($action == 'CONTRACT_CANCEL') {
565 565
             dol_syslog(
566
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
566
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
567 567
             );
568 568
         } elseif ($action == 'CONTRACT_CLOSE') {
569 569
             dol_syslog(
570
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
570
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
571 571
             );
572 572
         } elseif ($action == 'CONTRACT_DELETE') {
573 573
             dol_syslog(
574
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
574
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
575 575
             );
576 576
         }
577 577
 
578 578
 		elseif ($action == 'BILL_MODIFY') {
579 579
             dol_syslog(
580
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
580
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
581 581
             );
582 582
         } elseif ($action == 'BILL_VALIDATE') {
583 583
             dol_syslog(
584
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
584
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
585 585
             );
586 586
         } elseif ($action == 'BILL_BUILDDOC') {
587 587
             dol_syslog(
588
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
588
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
589 589
             );
590 590
         } elseif ($action == 'BILL_SENTBYMAIL') {
591 591
             dol_syslog(
592
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
592
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
593 593
             );
594 594
         } elseif ($action == 'BILL_CANCEL') {
595 595
             dol_syslog(
596
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
596
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
597 597
             );
598 598
         } elseif ($action == 'BILL_DELETE') {
599 599
             dol_syslog(
600
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
600
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
601 601
             );
602 602
         } elseif ($action == 'LINEBILL_INSERT') {
603 603
 				
604 604
         	dol_syslog(
605
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
605
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
606 606
             );
607 607
         } elseif ($action == 'LINEBILL_DELETE') {
608 608
             dol_syslog(
609
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
609
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
610 610
             );
611 611
         }
612 612
 
613 613
         // Payments
614 614
         elseif ($action == 'PAYMENT_CUSTOMER_CREATE') {
615 615
             dol_syslog(
616
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
616
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
617 617
             );
618 618
         } elseif ($action == 'PAYMENT_SUPPLIER_CREATE') {
619 619
             dol_syslog(
620
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
620
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
621 621
             );
622 622
         } elseif ($action == 'PAYMENT_ADD_TO_BANK') {
623 623
             dol_syslog(
624
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
624
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
625 625
             );
626 626
         } elseif ($action == 'PAYMENT_DELETE') {
627 627
             dol_syslog(
628
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
628
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
629 629
             );
630 630
         }
631 631
 
632 632
         // Interventions
633 633
         elseif ($action == 'FICHEINTER_CREATE') {
634 634
             dol_syslog(
635
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
635
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
636 636
             );
637 637
         } elseif ($action == 'FICHEINTER_MODIFY') {
638 638
             dol_syslog(
639
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
639
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
640 640
             );
641 641
         } elseif ($action == 'FICHEINTER_VALIDATE') {
642 642
             dol_syslog(
643
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
643
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
644 644
             );
645 645
         } elseif ($action == 'FICHEINTER_DELETE') {
646 646
             dol_syslog(
647
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
647
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
648 648
             );
649 649
         }
650 650
 
651 651
         // Members
652 652
         elseif ($action == 'MEMBER_CREATE') {
653 653
             dol_syslog(
654
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
654
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
655 655
             );
656 656
         } elseif ($action == 'MEMBER_VALIDATE') {
657 657
             dol_syslog(
658
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
658
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
659 659
             );
660 660
         } elseif ($action == 'MEMBER_SUBSCRIPTION') {
661 661
             dol_syslog(
662
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
662
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
663 663
             );
664 664
         } elseif ($action == 'MEMBER_MODIFY') {
665 665
             dol_syslog(
666
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
666
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
667 667
             );
668 668
         } elseif ($action == 'MEMBER_NEW_PASSWORD') {
669 669
             dol_syslog(
670
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
670
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
671 671
             );
672 672
         } elseif ($action == 'MEMBER_RESILIATE') {
673 673
             dol_syslog(
674
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
674
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
675 675
             );
676 676
         } elseif ($action == 'MEMBER_DELETE') {
677 677
             dol_syslog(
678
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
678
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
679 679
             );
680 680
         }
681 681
 
682 682
         // Categories
683 683
         elseif ($action == 'CATEGORY_CREATE') {
684 684
             dol_syslog(
685
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
685
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
686 686
             );
687 687
         } elseif ($action == 'CATEGORY_MODIFY') {
688 688
             dol_syslog(
689
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
689
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
690 690
             );
691 691
         } elseif ($action == 'CATEGORY_DELETE') {
692 692
             dol_syslog(
693
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
693
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
694 694
             );
695 695
         }
696 696
 
697 697
         // Projects
698 698
         elseif ($action == 'PROJECT_CREATE') {
699 699
             dol_syslog(
700
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
700
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
701 701
             );
702 702
         } elseif ($action == 'PROJECT_MODIFY') {
703 703
             dol_syslog(
704
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
704
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
705 705
             );
706 706
         } elseif ($action == 'PROJECT_DELETE') {
707 707
             dol_syslog(
708
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
708
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
709 709
             );
710 710
         }
711 711
 
712 712
         // Project tasks
713 713
         elseif ($action == 'TASK_CREATE') {
714 714
             dol_syslog(
715
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
715
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
716 716
             );
717 717
         } elseif ($action == 'TASK_MODIFY') {
718 718
             dol_syslog(
719
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
719
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
720 720
             );
721 721
         } elseif ($action == 'TASK_DELETE') {
722 722
             dol_syslog(
723
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
723
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
724 724
             );
725 725
         }
726 726
 
727 727
         // Task time spent
728 728
         elseif ($action == 'TASK_TIMESPENT_CREATE') {
729 729
             dol_syslog(
730
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
730
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
731 731
             );
732 732
         } elseif ($action == 'TASK_TIMESPENT_MODIFY') {
733 733
             dol_syslog(
734
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
734
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
735 735
             );
736 736
         } elseif ($action == 'TASK_TIMESPENT_DELETE') {
737 737
             dol_syslog(
738
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
738
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
739 739
             );
740 740
         }
741 741
 
742 742
         // Shipping
743 743
         elseif ($action == 'SHIPPING_CREATE') {
744 744
             dol_syslog(
745
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
745
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
746 746
             );
747 747
         } elseif ($action == 'SHIPPING_MODIFY') {
748 748
             dol_syslog(
749
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
749
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
750 750
             );
751 751
         } elseif ($action == 'SHIPPING_VALIDATE') {
752 752
             dol_syslog(
753
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
753
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
754 754
             );
755 755
         } elseif ($action == 'SHIPPING_SENTBYMAIL') {
756 756
             dol_syslog(
757
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
757
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
758 758
             );
759 759
         } elseif ($action == 'SHIPPING_DELETE') {
760 760
             dol_syslog(
761
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
761
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
762 762
             );
763 763
         } elseif ($action == 'SHIPPING_BUILDDOC') {
764 764
             dol_syslog(
765
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
765
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
766 766
             );
767 767
         }
768 768
 
769 769
         // File
770 770
         elseif ($action == 'FILE_UPLOAD') {
771 771
             dol_syslog(
772
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
772
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
773 773
             );
774 774
         } elseif ($action == 'FILE_DELETE') {
775 775
             dol_syslog(
776
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
776
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
777 777
             );
778 778
         }
779 779
 
Please login to merge, or discard this patch.