@@ -36,68 +36,68 @@ discard block |
||
36 | 36 | class Interfacesubtotaltrigger |
37 | 37 | { |
38 | 38 | |
39 | - private $db; |
|
40 | - |
|
41 | - /** |
|
42 | - * Constructor |
|
43 | - * |
|
44 | - * @param DoliDB $db Database handler |
|
45 | - */ |
|
46 | - public function __construct($db) |
|
47 | - { |
|
48 | - $this->db = $db; |
|
49 | - |
|
50 | - $this->name = preg_replace('/^Interface/i', '', get_class($this)); |
|
51 | - $this->family = "demo"; |
|
52 | - $this->description = "Triggers of this module are empty functions." |
|
53 | - . "They have no effect." |
|
54 | - . "They are provided for tutorial purpose only."; |
|
55 | - // 'development', 'experimental', 'dolibarr' or version |
|
56 | - $this->version = 'development'; |
|
57 | - $this->picto = 'titre@titre'; |
|
58 | - } |
|
59 | - |
|
60 | - /** |
|
61 | - * Trigger name |
|
62 | - * |
|
63 | - * @return string Name of trigger file |
|
64 | - */ |
|
65 | - public function getName() |
|
66 | - { |
|
67 | - return $this->name; |
|
68 | - } |
|
69 | - |
|
70 | - /** |
|
71 | - * Trigger description |
|
72 | - * |
|
73 | - * @return string Description of trigger file |
|
74 | - */ |
|
75 | - public function getDesc() |
|
76 | - { |
|
77 | - return $this->description; |
|
78 | - } |
|
79 | - |
|
80 | - /** |
|
81 | - * Trigger version |
|
82 | - * |
|
83 | - * @return string Version of trigger file |
|
84 | - */ |
|
85 | - public function getVersion() |
|
86 | - { |
|
87 | - global $langs; |
|
88 | - $langs->load("admin"); |
|
89 | - |
|
90 | - if ($this->version == 'development') { |
|
91 | - return $langs->trans("Development"); |
|
92 | - } elseif ($this->version == 'experimental') |
|
93 | - |
|
94 | - return $langs->trans("Experimental"); |
|
95 | - elseif ($this->version == 'dolibarr') return DOL_VERSION; |
|
96 | - elseif ($this->version) return $this->version; |
|
97 | - else { |
|
98 | - return $langs->trans("Unknown"); |
|
99 | - } |
|
100 | - } |
|
39 | + private $db; |
|
40 | + |
|
41 | + /** |
|
42 | + * Constructor |
|
43 | + * |
|
44 | + * @param DoliDB $db Database handler |
|
45 | + */ |
|
46 | + public function __construct($db) |
|
47 | + { |
|
48 | + $this->db = $db; |
|
49 | + |
|
50 | + $this->name = preg_replace('/^Interface/i', '', get_class($this)); |
|
51 | + $this->family = "demo"; |
|
52 | + $this->description = "Triggers of this module are empty functions." |
|
53 | + . "They have no effect." |
|
54 | + . "They are provided for tutorial purpose only."; |
|
55 | + // 'development', 'experimental', 'dolibarr' or version |
|
56 | + $this->version = 'development'; |
|
57 | + $this->picto = 'titre@titre'; |
|
58 | + } |
|
59 | + |
|
60 | + /** |
|
61 | + * Trigger name |
|
62 | + * |
|
63 | + * @return string Name of trigger file |
|
64 | + */ |
|
65 | + public function getName() |
|
66 | + { |
|
67 | + return $this->name; |
|
68 | + } |
|
69 | + |
|
70 | + /** |
|
71 | + * Trigger description |
|
72 | + * |
|
73 | + * @return string Description of trigger file |
|
74 | + */ |
|
75 | + public function getDesc() |
|
76 | + { |
|
77 | + return $this->description; |
|
78 | + } |
|
79 | + |
|
80 | + /** |
|
81 | + * Trigger version |
|
82 | + * |
|
83 | + * @return string Version of trigger file |
|
84 | + */ |
|
85 | + public function getVersion() |
|
86 | + { |
|
87 | + global $langs; |
|
88 | + $langs->load("admin"); |
|
89 | + |
|
90 | + if ($this->version == 'development') { |
|
91 | + return $langs->trans("Development"); |
|
92 | + } elseif ($this->version == 'experimental') |
|
93 | + |
|
94 | + return $langs->trans("Experimental"); |
|
95 | + elseif ($this->version == 'dolibarr') return DOL_VERSION; |
|
96 | + elseif ($this->version) return $this->version; |
|
97 | + else { |
|
98 | + return $langs->trans("Unknown"); |
|
99 | + } |
|
100 | + } |
|
101 | 101 | |
102 | 102 | public function addToBegin(&$parent, &$object, $rang) |
103 | 103 | { |
@@ -147,27 +147,27 @@ discard block |
||
147 | 147 | } |
148 | 148 | } |
149 | 149 | |
150 | - /** |
|
151 | - * Function called when a Dolibarrr business event is done. |
|
152 | - * All functions "run_trigger" are triggered if file |
|
153 | - * is inside directory core/triggers |
|
154 | - * |
|
155 | - * @param string $action Event action code |
|
156 | - * @param Object $object Object |
|
157 | - * @param User $user Object user |
|
158 | - * @param Translate $langs Object langs |
|
159 | - * @param conf $conf Object conf |
|
160 | - * @return int <0 if KO, 0 if no triggered ran, >0 if OK |
|
161 | - */ |
|
162 | - public function run_trigger($action, $object, $user, $langs, $conf) |
|
163 | - { |
|
164 | - // Put here code you want to execute when a Dolibarr business events occurs. |
|
165 | - // Data and type of action are stored into $object and $action |
|
166 | - // Users |
|
167 | - dol_include_once('/subtotal/class/subtotal.class.php'); |
|
168 | - $langs->load('subtotal@subtotal'); |
|
169 | - |
|
170 | - if (!empty($conf->global->SUBTOTAL_ALLOW_ADD_LINE_UNDER_TITLE) && in_array($action, array('LINEPROPAL_INSERT', 'LINEORDER_INSERT', 'LINEBILL_INSERT'))) |
|
150 | + /** |
|
151 | + * Function called when a Dolibarrr business event is done. |
|
152 | + * All functions "run_trigger" are triggered if file |
|
153 | + * is inside directory core/triggers |
|
154 | + * |
|
155 | + * @param string $action Event action code |
|
156 | + * @param Object $object Object |
|
157 | + * @param User $user Object user |
|
158 | + * @param Translate $langs Object langs |
|
159 | + * @param conf $conf Object conf |
|
160 | + * @return int <0 if KO, 0 if no triggered ran, >0 if OK |
|
161 | + */ |
|
162 | + public function run_trigger($action, $object, $user, $langs, $conf) |
|
163 | + { |
|
164 | + // Put here code you want to execute when a Dolibarr business events occurs. |
|
165 | + // Data and type of action are stored into $object and $action |
|
166 | + // Users |
|
167 | + dol_include_once('/subtotal/class/subtotal.class.php'); |
|
168 | + $langs->load('subtotal@subtotal'); |
|
169 | + |
|
170 | + if (!empty($conf->global->SUBTOTAL_ALLOW_ADD_LINE_UNDER_TITLE) && in_array($action, array('LINEPROPAL_INSERT', 'LINEORDER_INSERT', 'LINEBILL_INSERT'))) |
|
171 | 171 | { |
172 | 172 | |
173 | 173 | $rang = GETPOST('under_title', 'int'); // Rang du titre |
@@ -186,9 +186,9 @@ discard block |
||
186 | 186 | $parent = new Facture($this->db); |
187 | 187 | $parent->fetch($object->fk_facture); |
188 | 188 | break; |
189 | - case 'LINEBILL_SUPPLIER_CREATE': |
|
190 | - $parent = new FactureFournisseur($this->db); |
|
191 | - $parent->fetch($object->fk_facture_fourn); |
|
189 | + case 'LINEBILL_SUPPLIER_CREATE': |
|
190 | + $parent = new FactureFournisseur($this->db); |
|
191 | + $parent->fetch($object->fk_facture_fourn); |
|
192 | 192 | default: |
193 | 193 | $parent = $object; |
194 | 194 | break; |
@@ -202,9 +202,9 @@ discard block |
||
202 | 202 | } |
203 | 203 | |
204 | 204 | |
205 | - if ($action == 'LINEBILL_INSERT' || $action == 'LINEBILL_SUPPLIER_CREATE') |
|
205 | + if ($action == 'LINEBILL_INSERT' || $action == 'LINEBILL_SUPPLIER_CREATE') |
|
206 | 206 | { |
207 | - $is_supplier = $action == 'LINEBILL_SUPPLIER_CREATE' ? true : false; |
|
207 | + $is_supplier = $action == 'LINEBILL_SUPPLIER_CREATE' ? true : false; |
|
208 | 208 | $subtotal_add_title_bloc_from_orderstoinvoice = GETPOST('subtotal_add_title_bloc_from_orderstoinvoice'); |
209 | 209 | if (!empty($subtotal_add_title_bloc_from_orderstoinvoice)) |
210 | 210 | { |
@@ -214,38 +214,38 @@ discard block |
||
214 | 214 | $last_fk_commandedet = TSubtotal::getLastLineOrderId($this->db, $current_fk_commande, $is_supplier); |
215 | 215 | |
216 | 216 | if (!$is_supplier){ |
217 | - $facture = new Facture($this->db); |
|
218 | - $ret = $facture->fetch($object->fk_facture); |
|
219 | - } |
|
217 | + $facture = new Facture($this->db); |
|
218 | + $ret = $facture->fetch($object->fk_facture); |
|
219 | + } |
|
220 | 220 | else |
221 | - { |
|
222 | - $facture = new FactureFournisseur($this->db); |
|
223 | - $ret = $facture->fetch($object->fk_facture_fourn); |
|
224 | - } |
|
221 | + { |
|
222 | + $facture = new FactureFournisseur($this->db); |
|
223 | + $ret = $facture->fetch($object->fk_facture_fourn); |
|
224 | + } |
|
225 | 225 | |
226 | 226 | if ($ret > 0 && !$subtotal_bloc_already_add_st) |
227 | 227 | { |
228 | 228 | $rang = !empty($subtotal_current_rang) ? $subtotal_current_rang : $object->rang; |
229 | 229 | // Si le fk_commande courrant est différent alors on change de commande => ajout d'un titre |
230 | 230 | if ($current_fk_commande != $subtotal_bloc_previous_fk_commande ) { |
231 | - if (!$is_supplier) $commande = new Commande($this->db); |
|
232 | - else $commande = new CommandeFournisseur($this->db); |
|
233 | - $commande->fetch($current_fk_commande); |
|
234 | - |
|
235 | - $label = $conf->global->SUBTOTAL_TEXT_FOR_TITLE_ORDETSTOINVOICE; |
|
236 | - if (empty($label)) { |
|
237 | - $label = 'Commande [__REFORDER__]'; |
|
238 | - if (!$is_supplier) $label .= ' - Référence client : [__REFCUSTOMER__]'; |
|
239 | - } |
|
240 | - $label = str_replace(array('__REFORDER__', '__REFCUSTOMER__'), array($commande->ref, $commande->ref_client), $label); |
|
241 | - |
|
242 | - if (!empty($current_fk_commande)) { |
|
243 | - TSubtotal::addTitle($facture, $label, 1, $rang); |
|
244 | - $rang++; |
|
245 | - } |
|
246 | - } |
|
247 | - |
|
248 | - $object->rang = $rang; |
|
231 | + if (!$is_supplier) $commande = new Commande($this->db); |
|
232 | + else $commande = new CommandeFournisseur($this->db); |
|
233 | + $commande->fetch($current_fk_commande); |
|
234 | + |
|
235 | + $label = $conf->global->SUBTOTAL_TEXT_FOR_TITLE_ORDETSTOINVOICE; |
|
236 | + if (empty($label)) { |
|
237 | + $label = 'Commande [__REFORDER__]'; |
|
238 | + if (!$is_supplier) $label .= ' - Référence client : [__REFCUSTOMER__]'; |
|
239 | + } |
|
240 | + $label = str_replace(array('__REFORDER__', '__REFCUSTOMER__'), array($commande->ref, $commande->ref_client), $label); |
|
241 | + |
|
242 | + if (!empty($current_fk_commande)) { |
|
243 | + TSubtotal::addTitle($facture, $label, 1, $rang); |
|
244 | + $rang++; |
|
245 | + } |
|
246 | + } |
|
247 | + |
|
248 | + $object->rang = $rang; |
|
249 | 249 | $facture->updateRangOfLine($object->id, $rang); |
250 | 250 | |
251 | 251 | $rang++; |
@@ -253,10 +253,10 @@ discard block |
||
253 | 253 | // Est-ce qu'il s'agit de la dernière ligne de la commande d'origine ? Si oui alors on ajout un sous-total |
254 | 254 | if ($last_fk_commandedet == $object->origin_id && !empty($current_fk_commande)) |
255 | 255 | { |
256 | - $subtotal_bloc_already_add_st = 1; |
|
257 | - TSubtotal::addTotal($facture, $langs->trans('SubTotal'), 1, $rang); |
|
258 | - $subtotal_bloc_already_add_st = 0; |
|
259 | - $rang++; |
|
256 | + $subtotal_bloc_already_add_st = 1; |
|
257 | + TSubtotal::addTotal($facture, $langs->trans('SubTotal'), 1, $rang); |
|
258 | + $subtotal_bloc_already_add_st = 0; |
|
259 | + $rang++; |
|
260 | 260 | } |
261 | 261 | } |
262 | 262 | |
@@ -276,7 +276,7 @@ discard block |
||
276 | 276 | |
277 | 277 | if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && in_array($action, array('LINEPROPAL_INSERT', 'LINEPROPAL_UPDATE', 'LINEORDER_INSERT', 'LINEORDER_UPDATE', 'LINEBILL_INSERT', 'LINEBILL_UPDATE', 'LINEBILL_SUPPLIER_CREATE', 'LINEBILL_SUPPLIER_UPDATE'))) |
278 | 278 | { |
279 | - if(! function_exists('_updateLineNC')) dol_include_once('/subtotal/lib/subtotal.lib.php'); |
|
279 | + if(! function_exists('_updateLineNC')) dol_include_once('/subtotal/lib/subtotal.lib.php'); |
|
280 | 280 | |
281 | 281 | $doli_action = GETPOST('action'); |
282 | 282 | $set = GETPOST('set'); |
@@ -342,173 +342,173 @@ discard block |
||
342 | 342 | } |
343 | 343 | |
344 | 344 | |
345 | - if ($action == 'USER_LOGIN') { |
|
346 | - dol_syslog( |
|
347 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
348 | - ); |
|
349 | - } elseif ($action == 'USER_UPDATE_SESSION') { |
|
350 | - // Warning: To increase performances, this action is triggered only if |
|
351 | - // constant MAIN_ACTIVATE_UPDATESESSIONTRIGGER is set to 1. |
|
352 | - dol_syslog( |
|
353 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
354 | - ); |
|
355 | - } elseif ($action == 'USER_CREATE') { |
|
356 | - dol_syslog( |
|
357 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
358 | - ); |
|
359 | - } elseif ($action == 'USER_CREATE_FROM_CONTACT') { |
|
360 | - dol_syslog( |
|
361 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
362 | - ); |
|
363 | - } elseif ($action == 'USER_MODIFY') { |
|
364 | - dol_syslog( |
|
365 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
366 | - ); |
|
367 | - } elseif ($action == 'USER_NEW_PASSWORD') { |
|
368 | - dol_syslog( |
|
369 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
370 | - ); |
|
371 | - } elseif ($action == 'USER_ENABLEDISABLE') { |
|
372 | - dol_syslog( |
|
373 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
374 | - ); |
|
375 | - } elseif ($action == 'USER_DELETE') { |
|
376 | - dol_syslog( |
|
377 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
378 | - ); |
|
379 | - } elseif ($action == 'USER_LOGOUT') { |
|
380 | - dol_syslog( |
|
381 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
382 | - ); |
|
383 | - } elseif ($action == 'USER_SETINGROUP') { |
|
384 | - dol_syslog( |
|
385 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
386 | - ); |
|
387 | - } elseif ($action == 'USER_REMOVEFROMGROUP') { |
|
388 | - dol_syslog( |
|
389 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
390 | - ); |
|
391 | - } |
|
392 | - |
|
393 | - // Groups |
|
394 | - elseif ($action == 'GROUP_CREATE') { |
|
395 | - dol_syslog( |
|
396 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
397 | - ); |
|
398 | - } elseif ($action == 'GROUP_MODIFY') { |
|
399 | - dol_syslog( |
|
400 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
401 | - ); |
|
402 | - } elseif ($action == 'GROUP_DELETE') { |
|
403 | - dol_syslog( |
|
404 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
405 | - ); |
|
406 | - } |
|
407 | - |
|
408 | - // Companies |
|
409 | - elseif ($action == 'COMPANY_CREATE') { |
|
410 | - dol_syslog( |
|
411 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
412 | - ); |
|
413 | - } elseif ($action == 'COMPANY_MODIFY') { |
|
414 | - dol_syslog( |
|
415 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
416 | - ); |
|
417 | - } elseif ($action == 'COMPANY_DELETE') { |
|
418 | - dol_syslog( |
|
419 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
420 | - ); |
|
421 | - } |
|
422 | - |
|
423 | - // Contacts |
|
424 | - elseif ($action == 'CONTACT_CREATE') { |
|
425 | - dol_syslog( |
|
426 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
427 | - ); |
|
428 | - } elseif ($action == 'CONTACT_MODIFY') { |
|
429 | - dol_syslog( |
|
430 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
431 | - ); |
|
432 | - } elseif ($action == 'CONTACT_DELETE') { |
|
433 | - dol_syslog( |
|
434 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
435 | - ); |
|
436 | - } |
|
437 | - |
|
438 | - // Products |
|
439 | - elseif ($action == 'PRODUCT_CREATE') { |
|
440 | - dol_syslog( |
|
441 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
442 | - ); |
|
443 | - } elseif ($action == 'PRODUCT_MODIFY') { |
|
444 | - dol_syslog( |
|
445 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
446 | - ); |
|
447 | - } elseif ($action == 'PRODUCT_DELETE') { |
|
448 | - dol_syslog( |
|
449 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
450 | - ); |
|
451 | - } |
|
452 | - |
|
453 | - // Customer orders |
|
454 | - elseif ($action == 'ORDER_CREATE') { |
|
455 | - dol_syslog( |
|
456 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
457 | - ); |
|
458 | - } elseif ($action == 'ORDER_VALIDATE') { |
|
459 | - dol_syslog( |
|
460 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
461 | - ); |
|
462 | - } elseif ($action == 'ORDER_DELETE') { |
|
463 | - dol_syslog( |
|
464 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
465 | - ); |
|
466 | - } elseif ($action == 'ORDER_BUILDDOC') { |
|
467 | - dol_syslog( |
|
468 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
469 | - ); |
|
470 | - } elseif ($action == 'ORDER_SENTBYMAIL') { |
|
471 | - dol_syslog( |
|
472 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
473 | - ); |
|
474 | - } elseif ($action == 'LINEORDER_INSERT') { |
|
475 | - dol_syslog( |
|
476 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
477 | - ); |
|
478 | - } elseif ($action == 'LINEORDER_DELETE') { |
|
479 | - dol_syslog( |
|
480 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
481 | - ); |
|
482 | - } |
|
483 | - |
|
484 | - // Supplier orders |
|
485 | - elseif ($action == 'ORDER_SUPPLIER_CREATE') { |
|
486 | - dol_syslog( |
|
487 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
488 | - ); |
|
489 | - } elseif ($action == 'ORDER_SUPPLIER_VALIDATE') { |
|
490 | - dol_syslog( |
|
491 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
492 | - ); |
|
493 | - } elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL') { |
|
494 | - dol_syslog( |
|
495 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
496 | - ); |
|
497 | - } elseif ($action == 'SUPPLIER_ORDER_BUILDDOC') { |
|
498 | - dol_syslog( |
|
499 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
500 | - ); |
|
501 | - } |
|
502 | - |
|
503 | - // Proposals |
|
504 | - elseif ($action == 'PROPAL_CREATE') { |
|
505 | - dol_syslog( |
|
506 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
507 | - ); |
|
508 | - } elseif (in_array($action, array('PROPAL_CLONE', 'ORDER_CLONE', 'BILL_CLONE'))) { |
|
509 | - dol_syslog( |
|
510 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
511 | - ); |
|
345 | + if ($action == 'USER_LOGIN') { |
|
346 | + dol_syslog( |
|
347 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
348 | + ); |
|
349 | + } elseif ($action == 'USER_UPDATE_SESSION') { |
|
350 | + // Warning: To increase performances, this action is triggered only if |
|
351 | + // constant MAIN_ACTIVATE_UPDATESESSIONTRIGGER is set to 1. |
|
352 | + dol_syslog( |
|
353 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
354 | + ); |
|
355 | + } elseif ($action == 'USER_CREATE') { |
|
356 | + dol_syslog( |
|
357 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
358 | + ); |
|
359 | + } elseif ($action == 'USER_CREATE_FROM_CONTACT') { |
|
360 | + dol_syslog( |
|
361 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
362 | + ); |
|
363 | + } elseif ($action == 'USER_MODIFY') { |
|
364 | + dol_syslog( |
|
365 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
366 | + ); |
|
367 | + } elseif ($action == 'USER_NEW_PASSWORD') { |
|
368 | + dol_syslog( |
|
369 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
370 | + ); |
|
371 | + } elseif ($action == 'USER_ENABLEDISABLE') { |
|
372 | + dol_syslog( |
|
373 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
374 | + ); |
|
375 | + } elseif ($action == 'USER_DELETE') { |
|
376 | + dol_syslog( |
|
377 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
378 | + ); |
|
379 | + } elseif ($action == 'USER_LOGOUT') { |
|
380 | + dol_syslog( |
|
381 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
382 | + ); |
|
383 | + } elseif ($action == 'USER_SETINGROUP') { |
|
384 | + dol_syslog( |
|
385 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
386 | + ); |
|
387 | + } elseif ($action == 'USER_REMOVEFROMGROUP') { |
|
388 | + dol_syslog( |
|
389 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
390 | + ); |
|
391 | + } |
|
392 | + |
|
393 | + // Groups |
|
394 | + elseif ($action == 'GROUP_CREATE') { |
|
395 | + dol_syslog( |
|
396 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
397 | + ); |
|
398 | + } elseif ($action == 'GROUP_MODIFY') { |
|
399 | + dol_syslog( |
|
400 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
401 | + ); |
|
402 | + } elseif ($action == 'GROUP_DELETE') { |
|
403 | + dol_syslog( |
|
404 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
405 | + ); |
|
406 | + } |
|
407 | + |
|
408 | + // Companies |
|
409 | + elseif ($action == 'COMPANY_CREATE') { |
|
410 | + dol_syslog( |
|
411 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
412 | + ); |
|
413 | + } elseif ($action == 'COMPANY_MODIFY') { |
|
414 | + dol_syslog( |
|
415 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
416 | + ); |
|
417 | + } elseif ($action == 'COMPANY_DELETE') { |
|
418 | + dol_syslog( |
|
419 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
420 | + ); |
|
421 | + } |
|
422 | + |
|
423 | + // Contacts |
|
424 | + elseif ($action == 'CONTACT_CREATE') { |
|
425 | + dol_syslog( |
|
426 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
427 | + ); |
|
428 | + } elseif ($action == 'CONTACT_MODIFY') { |
|
429 | + dol_syslog( |
|
430 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
431 | + ); |
|
432 | + } elseif ($action == 'CONTACT_DELETE') { |
|
433 | + dol_syslog( |
|
434 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
435 | + ); |
|
436 | + } |
|
437 | + |
|
438 | + // Products |
|
439 | + elseif ($action == 'PRODUCT_CREATE') { |
|
440 | + dol_syslog( |
|
441 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
442 | + ); |
|
443 | + } elseif ($action == 'PRODUCT_MODIFY') { |
|
444 | + dol_syslog( |
|
445 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
446 | + ); |
|
447 | + } elseif ($action == 'PRODUCT_DELETE') { |
|
448 | + dol_syslog( |
|
449 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
450 | + ); |
|
451 | + } |
|
452 | + |
|
453 | + // Customer orders |
|
454 | + elseif ($action == 'ORDER_CREATE') { |
|
455 | + dol_syslog( |
|
456 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
457 | + ); |
|
458 | + } elseif ($action == 'ORDER_VALIDATE') { |
|
459 | + dol_syslog( |
|
460 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
461 | + ); |
|
462 | + } elseif ($action == 'ORDER_DELETE') { |
|
463 | + dol_syslog( |
|
464 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
465 | + ); |
|
466 | + } elseif ($action == 'ORDER_BUILDDOC') { |
|
467 | + dol_syslog( |
|
468 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
469 | + ); |
|
470 | + } elseif ($action == 'ORDER_SENTBYMAIL') { |
|
471 | + dol_syslog( |
|
472 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
473 | + ); |
|
474 | + } elseif ($action == 'LINEORDER_INSERT') { |
|
475 | + dol_syslog( |
|
476 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
477 | + ); |
|
478 | + } elseif ($action == 'LINEORDER_DELETE') { |
|
479 | + dol_syslog( |
|
480 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
481 | + ); |
|
482 | + } |
|
483 | + |
|
484 | + // Supplier orders |
|
485 | + elseif ($action == 'ORDER_SUPPLIER_CREATE') { |
|
486 | + dol_syslog( |
|
487 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
488 | + ); |
|
489 | + } elseif ($action == 'ORDER_SUPPLIER_VALIDATE') { |
|
490 | + dol_syslog( |
|
491 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
492 | + ); |
|
493 | + } elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL') { |
|
494 | + dol_syslog( |
|
495 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
496 | + ); |
|
497 | + } elseif ($action == 'SUPPLIER_ORDER_BUILDDOC') { |
|
498 | + dol_syslog( |
|
499 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
500 | + ); |
|
501 | + } |
|
502 | + |
|
503 | + // Proposals |
|
504 | + elseif ($action == 'PROPAL_CREATE') { |
|
505 | + dol_syslog( |
|
506 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
507 | + ); |
|
508 | + } elseif (in_array($action, array('PROPAL_CLONE', 'ORDER_CLONE', 'BILL_CLONE'))) { |
|
509 | + dol_syslog( |
|
510 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
511 | + ); |
|
512 | 512 | |
513 | 513 | $doli_action = GETPOST('action'); |
514 | 514 | |
@@ -541,296 +541,296 @@ discard block |
||
541 | 541 | if (!empty($line)) $object->update_price(1); |
542 | 542 | } |
543 | 543 | |
544 | - } elseif ($action == 'PROPAL_MODIFY') { |
|
545 | - dol_syslog( |
|
546 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
547 | - ); |
|
548 | - } elseif ($action == 'PROPAL_VALIDATE') { |
|
549 | - dol_syslog( |
|
550 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
551 | - ); |
|
552 | - } elseif ($action == 'PROPAL_BUILDDOC') { |
|
553 | - dol_syslog( |
|
554 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
555 | - ); |
|
556 | - } elseif ($action == 'PROPAL_SENTBYMAIL') { |
|
557 | - dol_syslog( |
|
558 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
559 | - ); |
|
560 | - } elseif ($action == 'PROPAL_CLOSE_SIGNED') { |
|
561 | - dol_syslog( |
|
562 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
563 | - ); |
|
564 | - } elseif ($action == 'PROPAL_CLOSE_REFUSED') { |
|
565 | - dol_syslog( |
|
566 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
567 | - ); |
|
568 | - } elseif ($action == 'PROPAL_DELETE') { |
|
569 | - dol_syslog( |
|
570 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
571 | - ); |
|
572 | - } elseif ($action == 'LINEPROPAL_INSERT') { |
|
573 | - dol_syslog( |
|
574 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
575 | - ); |
|
576 | - } elseif ($action == 'LINEPROPAL_MODIFY') { |
|
577 | - dol_syslog( |
|
578 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
579 | - ); |
|
580 | - } elseif ($action == 'LINEPROPAL_DELETE') { |
|
581 | - dol_syslog( |
|
582 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
583 | - ); |
|
584 | - } |
|
585 | - |
|
586 | - // Contracts |
|
587 | - elseif ($action == 'CONTRACT_CREATE') { |
|
588 | - dol_syslog( |
|
589 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
590 | - ); |
|
591 | - } elseif ($action == 'CONTRACT_MODIFY') { |
|
592 | - dol_syslog( |
|
593 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
594 | - ); |
|
595 | - } elseif ($action == 'CONTRACT_ACTIVATE') { |
|
596 | - dol_syslog( |
|
597 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
598 | - ); |
|
599 | - } elseif ($action == 'CONTRACT_CANCEL') { |
|
600 | - dol_syslog( |
|
601 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
602 | - ); |
|
603 | - } elseif ($action == 'CONTRACT_CLOSE') { |
|
604 | - dol_syslog( |
|
605 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
606 | - ); |
|
607 | - } elseif ($action == 'CONTRACT_DELETE') { |
|
608 | - dol_syslog( |
|
609 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
610 | - ); |
|
611 | - } |
|
544 | + } elseif ($action == 'PROPAL_MODIFY') { |
|
545 | + dol_syslog( |
|
546 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
547 | + ); |
|
548 | + } elseif ($action == 'PROPAL_VALIDATE') { |
|
549 | + dol_syslog( |
|
550 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
551 | + ); |
|
552 | + } elseif ($action == 'PROPAL_BUILDDOC') { |
|
553 | + dol_syslog( |
|
554 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
555 | + ); |
|
556 | + } elseif ($action == 'PROPAL_SENTBYMAIL') { |
|
557 | + dol_syslog( |
|
558 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
559 | + ); |
|
560 | + } elseif ($action == 'PROPAL_CLOSE_SIGNED') { |
|
561 | + dol_syslog( |
|
562 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
563 | + ); |
|
564 | + } elseif ($action == 'PROPAL_CLOSE_REFUSED') { |
|
565 | + dol_syslog( |
|
566 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
567 | + ); |
|
568 | + } elseif ($action == 'PROPAL_DELETE') { |
|
569 | + dol_syslog( |
|
570 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
571 | + ); |
|
572 | + } elseif ($action == 'LINEPROPAL_INSERT') { |
|
573 | + dol_syslog( |
|
574 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
575 | + ); |
|
576 | + } elseif ($action == 'LINEPROPAL_MODIFY') { |
|
577 | + dol_syslog( |
|
578 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
579 | + ); |
|
580 | + } elseif ($action == 'LINEPROPAL_DELETE') { |
|
581 | + dol_syslog( |
|
582 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
583 | + ); |
|
584 | + } |
|
585 | + |
|
586 | + // Contracts |
|
587 | + elseif ($action == 'CONTRACT_CREATE') { |
|
588 | + dol_syslog( |
|
589 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
590 | + ); |
|
591 | + } elseif ($action == 'CONTRACT_MODIFY') { |
|
592 | + dol_syslog( |
|
593 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
594 | + ); |
|
595 | + } elseif ($action == 'CONTRACT_ACTIVATE') { |
|
596 | + dol_syslog( |
|
597 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
598 | + ); |
|
599 | + } elseif ($action == 'CONTRACT_CANCEL') { |
|
600 | + dol_syslog( |
|
601 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
602 | + ); |
|
603 | + } elseif ($action == 'CONTRACT_CLOSE') { |
|
604 | + dol_syslog( |
|
605 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
606 | + ); |
|
607 | + } elseif ($action == 'CONTRACT_DELETE') { |
|
608 | + dol_syslog( |
|
609 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
610 | + ); |
|
611 | + } |
|
612 | 612 | |
613 | 613 | elseif ($action == 'BILL_MODIFY') { |
614 | - dol_syslog( |
|
615 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
616 | - ); |
|
617 | - |
|
618 | - |
|
619 | - global $conf; |
|
620 | - |
|
621 | - if (!empty($conf->global->INVOICE_USE_SITUATION) && $object->element == 'facture' && $object->type == Facture::TYPE_SITUATION) |
|
622 | - { |
|
623 | - $object->situation_final = 1; |
|
624 | - foreach($object->lines as $i => $line) { |
|
625 | - if(!TSubtotal::isModSubtotalLine($line) && $line->situation_percent != 100){ |
|
626 | - $object->situation_final = 0; |
|
627 | - break; |
|
628 | - } |
|
629 | - } |
|
630 | - // ne pas utiliser $object->setFinal ne peut pas marcher |
|
631 | - $sql = 'UPDATE ' . MAIN_DB_PREFIX . 'facture SET situation_final = ' . $object->situation_final . ' where rowid = ' . $object->id; |
|
632 | - $resql=$object->db->query($sql); |
|
633 | - } |
|
634 | - |
|
635 | - |
|
636 | - } elseif ($action == 'BILL_VALIDATE') { |
|
637 | - dol_syslog( |
|
638 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
639 | - ); |
|
640 | - } elseif ($action == 'BILL_BUILDDOC') { |
|
641 | - dol_syslog( |
|
642 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
643 | - ); |
|
644 | - } elseif ($action == 'BILL_SENTBYMAIL') { |
|
645 | - dol_syslog( |
|
646 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
647 | - ); |
|
648 | - } elseif ($action == 'BILL_CANCEL') { |
|
649 | - dol_syslog( |
|
650 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
651 | - ); |
|
652 | - } elseif ($action == 'BILL_DELETE') { |
|
653 | - dol_syslog( |
|
654 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
655 | - ); |
|
656 | - } elseif ($action == 'LINEBILL_INSERT') { |
|
614 | + dol_syslog( |
|
615 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
616 | + ); |
|
617 | + |
|
618 | + |
|
619 | + global $conf; |
|
620 | + |
|
621 | + if (!empty($conf->global->INVOICE_USE_SITUATION) && $object->element == 'facture' && $object->type == Facture::TYPE_SITUATION) |
|
622 | + { |
|
623 | + $object->situation_final = 1; |
|
624 | + foreach($object->lines as $i => $line) { |
|
625 | + if(!TSubtotal::isModSubtotalLine($line) && $line->situation_percent != 100){ |
|
626 | + $object->situation_final = 0; |
|
627 | + break; |
|
628 | + } |
|
629 | + } |
|
630 | + // ne pas utiliser $object->setFinal ne peut pas marcher |
|
631 | + $sql = 'UPDATE ' . MAIN_DB_PREFIX . 'facture SET situation_final = ' . $object->situation_final . ' where rowid = ' . $object->id; |
|
632 | + $resql=$object->db->query($sql); |
|
633 | + } |
|
634 | + |
|
635 | + |
|
636 | + } elseif ($action == 'BILL_VALIDATE') { |
|
637 | + dol_syslog( |
|
638 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
639 | + ); |
|
640 | + } elseif ($action == 'BILL_BUILDDOC') { |
|
641 | + dol_syslog( |
|
642 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
643 | + ); |
|
644 | + } elseif ($action == 'BILL_SENTBYMAIL') { |
|
645 | + dol_syslog( |
|
646 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
647 | + ); |
|
648 | + } elseif ($action == 'BILL_CANCEL') { |
|
649 | + dol_syslog( |
|
650 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
651 | + ); |
|
652 | + } elseif ($action == 'BILL_DELETE') { |
|
653 | + dol_syslog( |
|
654 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
655 | + ); |
|
656 | + } elseif ($action == 'LINEBILL_INSERT') { |
|
657 | 657 | |
658 | - dol_syslog( |
|
659 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
660 | - ); |
|
661 | - } elseif ($action == 'LINEBILL_DELETE') { |
|
662 | - dol_syslog( |
|
663 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
664 | - ); |
|
665 | - } |
|
666 | - |
|
667 | - // Payments |
|
668 | - elseif ($action == 'PAYMENT_CUSTOMER_CREATE') { |
|
669 | - dol_syslog( |
|
670 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
671 | - ); |
|
672 | - } elseif ($action == 'PAYMENT_SUPPLIER_CREATE') { |
|
673 | - dol_syslog( |
|
674 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
675 | - ); |
|
676 | - } elseif ($action == 'PAYMENT_ADD_TO_BANK') { |
|
677 | - dol_syslog( |
|
678 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
679 | - ); |
|
680 | - } elseif ($action == 'PAYMENT_DELETE') { |
|
681 | - dol_syslog( |
|
682 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
683 | - ); |
|
684 | - } |
|
685 | - |
|
686 | - // Interventions |
|
687 | - elseif ($action == 'FICHEINTER_CREATE') { |
|
688 | - dol_syslog( |
|
689 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
690 | - ); |
|
691 | - } elseif ($action == 'FICHEINTER_MODIFY') { |
|
692 | - dol_syslog( |
|
693 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
694 | - ); |
|
695 | - } elseif ($action == 'FICHEINTER_VALIDATE') { |
|
696 | - dol_syslog( |
|
697 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
698 | - ); |
|
699 | - } elseif ($action == 'FICHEINTER_DELETE') { |
|
700 | - dol_syslog( |
|
701 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
702 | - ); |
|
703 | - } |
|
704 | - |
|
705 | - // Members |
|
706 | - elseif ($action == 'MEMBER_CREATE') { |
|
707 | - dol_syslog( |
|
708 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
709 | - ); |
|
710 | - } elseif ($action == 'MEMBER_VALIDATE') { |
|
711 | - dol_syslog( |
|
712 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
713 | - ); |
|
714 | - } elseif ($action == 'MEMBER_SUBSCRIPTION') { |
|
715 | - dol_syslog( |
|
716 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
717 | - ); |
|
718 | - } elseif ($action == 'MEMBER_MODIFY') { |
|
719 | - dol_syslog( |
|
720 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
721 | - ); |
|
722 | - } elseif ($action == 'MEMBER_NEW_PASSWORD') { |
|
723 | - dol_syslog( |
|
724 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
725 | - ); |
|
726 | - } elseif ($action == 'MEMBER_RESILIATE') { |
|
727 | - dol_syslog( |
|
728 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
729 | - ); |
|
730 | - } elseif ($action == 'MEMBER_DELETE') { |
|
731 | - dol_syslog( |
|
732 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
733 | - ); |
|
734 | - } |
|
735 | - |
|
736 | - // Categories |
|
737 | - elseif ($action == 'CATEGORY_CREATE') { |
|
738 | - dol_syslog( |
|
739 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
740 | - ); |
|
741 | - } elseif ($action == 'CATEGORY_MODIFY') { |
|
742 | - dol_syslog( |
|
743 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
744 | - ); |
|
745 | - } elseif ($action == 'CATEGORY_DELETE') { |
|
746 | - dol_syslog( |
|
747 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
748 | - ); |
|
749 | - } |
|
750 | - |
|
751 | - // Projects |
|
752 | - elseif ($action == 'PROJECT_CREATE') { |
|
753 | - dol_syslog( |
|
754 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
755 | - ); |
|
756 | - } elseif ($action == 'PROJECT_MODIFY') { |
|
757 | - dol_syslog( |
|
758 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
759 | - ); |
|
760 | - } elseif ($action == 'PROJECT_DELETE') { |
|
761 | - dol_syslog( |
|
762 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
763 | - ); |
|
764 | - } |
|
765 | - |
|
766 | - // Project tasks |
|
767 | - elseif ($action == 'TASK_CREATE') { |
|
768 | - dol_syslog( |
|
769 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
770 | - ); |
|
771 | - } elseif ($action == 'TASK_MODIFY') { |
|
772 | - dol_syslog( |
|
773 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
774 | - ); |
|
775 | - } elseif ($action == 'TASK_DELETE') { |
|
776 | - dol_syslog( |
|
777 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
778 | - ); |
|
779 | - } |
|
780 | - |
|
781 | - // Task time spent |
|
782 | - elseif ($action == 'TASK_TIMESPENT_CREATE') { |
|
783 | - dol_syslog( |
|
784 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
785 | - ); |
|
786 | - } elseif ($action == 'TASK_TIMESPENT_MODIFY') { |
|
787 | - dol_syslog( |
|
788 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
789 | - ); |
|
790 | - } elseif ($action == 'TASK_TIMESPENT_DELETE') { |
|
791 | - dol_syslog( |
|
792 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
793 | - ); |
|
794 | - } |
|
795 | - |
|
796 | - // Shipping |
|
797 | - elseif ($action == 'SHIPPING_CREATE') { |
|
798 | - dol_syslog( |
|
799 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
800 | - ); |
|
801 | - } elseif ($action == 'SHIPPING_MODIFY') { |
|
802 | - dol_syslog( |
|
803 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
804 | - ); |
|
805 | - } elseif ($action == 'SHIPPING_VALIDATE') { |
|
806 | - dol_syslog( |
|
807 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
808 | - ); |
|
809 | - } elseif ($action == 'SHIPPING_SENTBYMAIL') { |
|
810 | - dol_syslog( |
|
811 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
812 | - ); |
|
813 | - } elseif ($action == 'SHIPPING_DELETE') { |
|
814 | - dol_syslog( |
|
815 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
816 | - ); |
|
817 | - } elseif ($action == 'SHIPPING_BUILDDOC') { |
|
818 | - dol_syslog( |
|
819 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
820 | - ); |
|
821 | - } |
|
822 | - |
|
823 | - // File |
|
824 | - elseif ($action == 'FILE_UPLOAD') { |
|
825 | - dol_syslog( |
|
826 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
827 | - ); |
|
828 | - } elseif ($action == 'FILE_DELETE') { |
|
829 | - dol_syslog( |
|
830 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
831 | - ); |
|
832 | - } |
|
833 | - |
|
834 | - return 0; |
|
835 | - } |
|
658 | + dol_syslog( |
|
659 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
660 | + ); |
|
661 | + } elseif ($action == 'LINEBILL_DELETE') { |
|
662 | + dol_syslog( |
|
663 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
664 | + ); |
|
665 | + } |
|
666 | + |
|
667 | + // Payments |
|
668 | + elseif ($action == 'PAYMENT_CUSTOMER_CREATE') { |
|
669 | + dol_syslog( |
|
670 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
671 | + ); |
|
672 | + } elseif ($action == 'PAYMENT_SUPPLIER_CREATE') { |
|
673 | + dol_syslog( |
|
674 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
675 | + ); |
|
676 | + } elseif ($action == 'PAYMENT_ADD_TO_BANK') { |
|
677 | + dol_syslog( |
|
678 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
679 | + ); |
|
680 | + } elseif ($action == 'PAYMENT_DELETE') { |
|
681 | + dol_syslog( |
|
682 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
683 | + ); |
|
684 | + } |
|
685 | + |
|
686 | + // Interventions |
|
687 | + elseif ($action == 'FICHEINTER_CREATE') { |
|
688 | + dol_syslog( |
|
689 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
690 | + ); |
|
691 | + } elseif ($action == 'FICHEINTER_MODIFY') { |
|
692 | + dol_syslog( |
|
693 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
694 | + ); |
|
695 | + } elseif ($action == 'FICHEINTER_VALIDATE') { |
|
696 | + dol_syslog( |
|
697 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
698 | + ); |
|
699 | + } elseif ($action == 'FICHEINTER_DELETE') { |
|
700 | + dol_syslog( |
|
701 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
702 | + ); |
|
703 | + } |
|
704 | + |
|
705 | + // Members |
|
706 | + elseif ($action == 'MEMBER_CREATE') { |
|
707 | + dol_syslog( |
|
708 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
709 | + ); |
|
710 | + } elseif ($action == 'MEMBER_VALIDATE') { |
|
711 | + dol_syslog( |
|
712 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
713 | + ); |
|
714 | + } elseif ($action == 'MEMBER_SUBSCRIPTION') { |
|
715 | + dol_syslog( |
|
716 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
717 | + ); |
|
718 | + } elseif ($action == 'MEMBER_MODIFY') { |
|
719 | + dol_syslog( |
|
720 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
721 | + ); |
|
722 | + } elseif ($action == 'MEMBER_NEW_PASSWORD') { |
|
723 | + dol_syslog( |
|
724 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
725 | + ); |
|
726 | + } elseif ($action == 'MEMBER_RESILIATE') { |
|
727 | + dol_syslog( |
|
728 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
729 | + ); |
|
730 | + } elseif ($action == 'MEMBER_DELETE') { |
|
731 | + dol_syslog( |
|
732 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
733 | + ); |
|
734 | + } |
|
735 | + |
|
736 | + // Categories |
|
737 | + elseif ($action == 'CATEGORY_CREATE') { |
|
738 | + dol_syslog( |
|
739 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
740 | + ); |
|
741 | + } elseif ($action == 'CATEGORY_MODIFY') { |
|
742 | + dol_syslog( |
|
743 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
744 | + ); |
|
745 | + } elseif ($action == 'CATEGORY_DELETE') { |
|
746 | + dol_syslog( |
|
747 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
748 | + ); |
|
749 | + } |
|
750 | + |
|
751 | + // Projects |
|
752 | + elseif ($action == 'PROJECT_CREATE') { |
|
753 | + dol_syslog( |
|
754 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
755 | + ); |
|
756 | + } elseif ($action == 'PROJECT_MODIFY') { |
|
757 | + dol_syslog( |
|
758 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
759 | + ); |
|
760 | + } elseif ($action == 'PROJECT_DELETE') { |
|
761 | + dol_syslog( |
|
762 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
763 | + ); |
|
764 | + } |
|
765 | + |
|
766 | + // Project tasks |
|
767 | + elseif ($action == 'TASK_CREATE') { |
|
768 | + dol_syslog( |
|
769 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
770 | + ); |
|
771 | + } elseif ($action == 'TASK_MODIFY') { |
|
772 | + dol_syslog( |
|
773 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
774 | + ); |
|
775 | + } elseif ($action == 'TASK_DELETE') { |
|
776 | + dol_syslog( |
|
777 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
778 | + ); |
|
779 | + } |
|
780 | + |
|
781 | + // Task time spent |
|
782 | + elseif ($action == 'TASK_TIMESPENT_CREATE') { |
|
783 | + dol_syslog( |
|
784 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
785 | + ); |
|
786 | + } elseif ($action == 'TASK_TIMESPENT_MODIFY') { |
|
787 | + dol_syslog( |
|
788 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
789 | + ); |
|
790 | + } elseif ($action == 'TASK_TIMESPENT_DELETE') { |
|
791 | + dol_syslog( |
|
792 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
793 | + ); |
|
794 | + } |
|
795 | + |
|
796 | + // Shipping |
|
797 | + elseif ($action == 'SHIPPING_CREATE') { |
|
798 | + dol_syslog( |
|
799 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
800 | + ); |
|
801 | + } elseif ($action == 'SHIPPING_MODIFY') { |
|
802 | + dol_syslog( |
|
803 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
804 | + ); |
|
805 | + } elseif ($action == 'SHIPPING_VALIDATE') { |
|
806 | + dol_syslog( |
|
807 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
808 | + ); |
|
809 | + } elseif ($action == 'SHIPPING_SENTBYMAIL') { |
|
810 | + dol_syslog( |
|
811 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
812 | + ); |
|
813 | + } elseif ($action == 'SHIPPING_DELETE') { |
|
814 | + dol_syslog( |
|
815 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
816 | + ); |
|
817 | + } elseif ($action == 'SHIPPING_BUILDDOC') { |
|
818 | + dol_syslog( |
|
819 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
820 | + ); |
|
821 | + } |
|
822 | + |
|
823 | + // File |
|
824 | + elseif ($action == 'FILE_UPLOAD') { |
|
825 | + dol_syslog( |
|
826 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
827 | + ); |
|
828 | + } elseif ($action == 'FILE_DELETE') { |
|
829 | + dol_syslog( |
|
830 | + "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
831 | + ); |
|
832 | + } |
|
833 | + |
|
834 | + return 0; |
|
835 | + } |
|
836 | 836 | } |
837 | 837 | \ No newline at end of file |
@@ -107,13 +107,13 @@ discard block |
||
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 |
||
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 | |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | $current_fk_commande = TSubtotal::getOrderIdFromLineId($this->db, $object->origin_id, $is_supplier); |
214 | 214 | $last_fk_commandedet = TSubtotal::getLastLineOrderId($this->db, $current_fk_commande, $is_supplier); |
215 | 215 | |
216 | - if (!$is_supplier){ |
|
216 | + if (!$is_supplier) { |
|
217 | 217 | $facture = new Facture($this->db); |
218 | 218 | $ret = $facture->fetch($object->fk_facture); |
219 | 219 | } |
@@ -227,7 +227,7 @@ discard block |
||
227 | 227 | { |
228 | 228 | $rang = !empty($subtotal_current_rang) ? $subtotal_current_rang : $object->rang; |
229 | 229 | // Si le fk_commande courrant est différent alors on change de commande => ajout d'un titre |
230 | - if ($current_fk_commande != $subtotal_bloc_previous_fk_commande ) { |
|
230 | + if ($current_fk_commande != $subtotal_bloc_previous_fk_commande) { |
|
231 | 231 | if (!$is_supplier) $commande = new Commande($this->db); |
232 | 232 | else $commande = new CommandeFournisseur($this->db); |
233 | 233 | $commande->fetch($current_fk_commande); |
@@ -276,14 +276,14 @@ discard block |
||
276 | 276 | |
277 | 277 | if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && in_array($action, array('LINEPROPAL_INSERT', 'LINEPROPAL_UPDATE', 'LINEORDER_INSERT', 'LINEORDER_UPDATE', 'LINEBILL_INSERT', 'LINEBILL_UPDATE', 'LINEBILL_SUPPLIER_CREATE', 'LINEBILL_SUPPLIER_UPDATE'))) |
278 | 278 | { |
279 | - if(! function_exists('_updateLineNC')) dol_include_once('/subtotal/lib/subtotal.lib.php'); |
|
279 | + if (!function_exists('_updateLineNC')) dol_include_once('/subtotal/lib/subtotal.lib.php'); |
|
280 | 280 | |
281 | 281 | $doli_action = GETPOST('action'); |
282 | 282 | $set = GETPOST('set'); |
283 | - if ( (in_array($doli_action, array('updateligne', 'updateline', 'addline', 'add', 'create', 'setstatut')) || $set == 'defaultTVA') && !TSubtotal::isTitle($object) && !TSubtotal::isSubtotal($object) && in_array($object->element, array('propaldet', 'commandedet', 'facturedet'))) |
|
283 | + if ((in_array($doli_action, array('updateligne', 'updateline', 'addline', 'add', 'create', 'setstatut')) || $set == 'defaultTVA') && !TSubtotal::isTitle($object) && !TSubtotal::isSubtotal($object) && in_array($object->element, array('propaldet', 'commandedet', 'facturedet'))) |
|
284 | 284 | { |
285 | 285 | dol_syslog( |
286 | - "[SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS] Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". object=".$object->element." id=" . $object->id |
|
286 | + "[SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS] Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". object=".$object->element." id=".$object->id |
|
287 | 287 | ); |
288 | 288 | |
289 | 289 | $TTitle = TSubtotal::getAllTitleFromLine($object); |
@@ -303,9 +303,9 @@ discard block |
||
303 | 303 | } |
304 | 304 | |
305 | 305 | // $object correspond à la ligne ajoutée |
306 | - if(empty($object->array_options)) $object->fetch_optionals(); |
|
306 | + if (empty($object->array_options)) $object->fetch_optionals(); |
|
307 | 307 | |
308 | - if(! empty($object->array_options['options_subtotal_nc'])) { |
|
308 | + if (!empty($object->array_options['options_subtotal_nc'])) { |
|
309 | 309 | $object->total_ht = $object->total_tva = $object->total_ttc = $object->total_localtax1 = $object->total_localtax2 = |
310 | 310 | $object->multicurrency_total_ht = $object->multicurrency_total_tva = $object->multicurrency_total_ttc = 0; |
311 | 311 | |
@@ -317,11 +317,11 @@ discard block |
||
317 | 317 | |
318 | 318 | // Correction d'un bug lors de la création d'une commande depuis une propale qui a, au moins, une ligne NC |
319 | 319 | $parent_element = ''; |
320 | - if($object->element == 'propaldet') $parent_element = 'propal'; |
|
321 | - if($object->element == 'commandedet') $parent_element = 'commande'; |
|
322 | - if($object->element == 'facturedet') $parent_element = 'facture'; |
|
320 | + if ($object->element == 'propaldet') $parent_element = 'propal'; |
|
321 | + if ($object->element == 'commandedet') $parent_element = 'commande'; |
|
322 | + if ($object->element == 'facturedet') $parent_element = 'facture'; |
|
323 | 323 | |
324 | - if(! empty($parent_element) && ! empty($object->array_options['options_subtotal_nc'])) { |
|
324 | + if (!empty($parent_element) && !empty($object->array_options['options_subtotal_nc'])) { |
|
325 | 325 | _updateLineNC($parent_element, $object->{'fk_'.$parent_element}, $object->id, $object->array_options['options_subtotal_nc'], 1); |
326 | 326 | } |
327 | 327 | } |
@@ -329,12 +329,12 @@ discard block |
||
329 | 329 | |
330 | 330 | // 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 |
331 | 331 | if ($action == 'BILL_CREATE' && $object->fac_rec > 0) { |
332 | - dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id); |
|
332 | + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); |
|
333 | 333 | |
334 | 334 | $object->fetch_lines(); // Lignes pas rajoutées à $object->lines par les appels à addline(); |
335 | 335 | |
336 | - foreach($object->lines as &$line) { |
|
337 | - if(TSubtotal::isSubtotal($line) && ! empty($line->tva_tx)) { |
|
336 | + foreach ($object->lines as &$line) { |
|
337 | + if (TSubtotal::isSubtotal($line) && !empty($line->tva_tx)) { |
|
338 | 338 | $line->tva_tx = 0; |
339 | 339 | $line->update(); |
340 | 340 | } |
@@ -344,170 +344,170 @@ discard block |
||
344 | 344 | |
345 | 345 | if ($action == 'USER_LOGIN') { |
346 | 346 | dol_syslog( |
347 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
347 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
348 | 348 | ); |
349 | 349 | } elseif ($action == 'USER_UPDATE_SESSION') { |
350 | 350 | // Warning: To increase performances, this action is triggered only if |
351 | 351 | // constant MAIN_ACTIVATE_UPDATESESSIONTRIGGER is set to 1. |
352 | 352 | dol_syslog( |
353 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
353 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
354 | 354 | ); |
355 | 355 | } elseif ($action == 'USER_CREATE') { |
356 | 356 | dol_syslog( |
357 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
357 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
358 | 358 | ); |
359 | 359 | } elseif ($action == 'USER_CREATE_FROM_CONTACT') { |
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 == 'USER_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 == 'USER_NEW_PASSWORD') { |
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 | } elseif ($action == 'USER_ENABLEDISABLE') { |
372 | 372 | dol_syslog( |
373 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
373 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
374 | 374 | ); |
375 | 375 | } elseif ($action == 'USER_DELETE') { |
376 | 376 | dol_syslog( |
377 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
377 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
378 | 378 | ); |
379 | 379 | } elseif ($action == 'USER_LOGOUT') { |
380 | 380 | dol_syslog( |
381 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
381 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
382 | 382 | ); |
383 | 383 | } elseif ($action == 'USER_SETINGROUP') { |
384 | 384 | dol_syslog( |
385 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
385 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
386 | 386 | ); |
387 | 387 | } elseif ($action == 'USER_REMOVEFROMGROUP') { |
388 | 388 | dol_syslog( |
389 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
389 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
390 | 390 | ); |
391 | 391 | } |
392 | 392 | |
393 | 393 | // Groups |
394 | 394 | elseif ($action == 'GROUP_CREATE') { |
395 | 395 | dol_syslog( |
396 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
396 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
397 | 397 | ); |
398 | 398 | } elseif ($action == 'GROUP_MODIFY') { |
399 | 399 | dol_syslog( |
400 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
400 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
401 | 401 | ); |
402 | 402 | } elseif ($action == 'GROUP_DELETE') { |
403 | 403 | dol_syslog( |
404 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
404 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
405 | 405 | ); |
406 | 406 | } |
407 | 407 | |
408 | 408 | // Companies |
409 | 409 | elseif ($action == 'COMPANY_CREATE') { |
410 | 410 | dol_syslog( |
411 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
411 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
412 | 412 | ); |
413 | 413 | } elseif ($action == 'COMPANY_MODIFY') { |
414 | 414 | dol_syslog( |
415 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
415 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
416 | 416 | ); |
417 | 417 | } elseif ($action == 'COMPANY_DELETE') { |
418 | 418 | dol_syslog( |
419 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
419 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
420 | 420 | ); |
421 | 421 | } |
422 | 422 | |
423 | 423 | // Contacts |
424 | 424 | elseif ($action == 'CONTACT_CREATE') { |
425 | 425 | dol_syslog( |
426 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
426 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
427 | 427 | ); |
428 | 428 | } elseif ($action == 'CONTACT_MODIFY') { |
429 | 429 | dol_syslog( |
430 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
430 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
431 | 431 | ); |
432 | 432 | } elseif ($action == 'CONTACT_DELETE') { |
433 | 433 | dol_syslog( |
434 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
434 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
435 | 435 | ); |
436 | 436 | } |
437 | 437 | |
438 | 438 | // Products |
439 | 439 | elseif ($action == 'PRODUCT_CREATE') { |
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 == 'PRODUCT_MODIFY') { |
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 | } elseif ($action == 'PRODUCT_DELETE') { |
448 | 448 | dol_syslog( |
449 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
449 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
450 | 450 | ); |
451 | 451 | } |
452 | 452 | |
453 | 453 | // Customer orders |
454 | 454 | elseif ($action == 'ORDER_CREATE') { |
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_VALIDATE') { |
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 == 'ORDER_DELETE') { |
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 | } elseif ($action == 'ORDER_BUILDDOC') { |
467 | 467 | dol_syslog( |
468 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
468 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
469 | 469 | ); |
470 | 470 | } elseif ($action == 'ORDER_SENTBYMAIL') { |
471 | 471 | dol_syslog( |
472 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
472 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
473 | 473 | ); |
474 | 474 | } elseif ($action == 'LINEORDER_INSERT') { |
475 | 475 | dol_syslog( |
476 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
476 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
477 | 477 | ); |
478 | 478 | } elseif ($action == 'LINEORDER_DELETE') { |
479 | 479 | dol_syslog( |
480 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
480 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
481 | 481 | ); |
482 | 482 | } |
483 | 483 | |
484 | 484 | // Supplier orders |
485 | 485 | elseif ($action == 'ORDER_SUPPLIER_CREATE') { |
486 | 486 | dol_syslog( |
487 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
487 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
488 | 488 | ); |
489 | 489 | } elseif ($action == 'ORDER_SUPPLIER_VALIDATE') { |
490 | 490 | dol_syslog( |
491 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
491 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
492 | 492 | ); |
493 | 493 | } elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL') { |
494 | 494 | dol_syslog( |
495 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
495 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
496 | 496 | ); |
497 | 497 | } elseif ($action == 'SUPPLIER_ORDER_BUILDDOC') { |
498 | 498 | dol_syslog( |
499 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
499 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
500 | 500 | ); |
501 | 501 | } |
502 | 502 | |
503 | 503 | // Proposals |
504 | 504 | elseif ($action == 'PROPAL_CREATE') { |
505 | 505 | dol_syslog( |
506 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
506 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
507 | 507 | ); |
508 | 508 | } elseif (in_array($action, array('PROPAL_CLONE', 'ORDER_CLONE', 'BILL_CLONE'))) { |
509 | 509 | dol_syslog( |
510 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
510 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
511 | 511 | ); |
512 | 512 | |
513 | 513 | $doli_action = GETPOST('action'); |
@@ -515,7 +515,7 @@ discard block |
||
515 | 515 | if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && in_array($doli_action, array('confirm_clone'))) |
516 | 516 | { |
517 | 517 | dol_syslog( |
518 | - "[SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS] Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". object=".$object->element." id=" . $object->id |
|
518 | + "[SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS] Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". object=".$object->element." id=".$object->id |
|
519 | 519 | ); |
520 | 520 | |
521 | 521 | // En fonction de l'objet et de la version, les lignes conservent l'id de l'objet d'origine |
@@ -543,76 +543,76 @@ discard block |
||
543 | 543 | |
544 | 544 | } elseif ($action == 'PROPAL_MODIFY') { |
545 | 545 | dol_syslog( |
546 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
546 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
547 | 547 | ); |
548 | 548 | } elseif ($action == 'PROPAL_VALIDATE') { |
549 | 549 | dol_syslog( |
550 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
550 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
551 | 551 | ); |
552 | 552 | } elseif ($action == 'PROPAL_BUILDDOC') { |
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 == 'PROPAL_SENTBYMAIL') { |
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 == 'PROPAL_CLOSE_SIGNED') { |
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 == 'PROPAL_CLOSE_REFUSED') { |
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 == 'PROPAL_DELETE') { |
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 == 'LINEPROPAL_INSERT') { |
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 | } elseif ($action == 'LINEPROPAL_MODIFY') { |
577 | 577 | dol_syslog( |
578 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
578 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
579 | 579 | ); |
580 | 580 | } elseif ($action == 'LINEPROPAL_DELETE') { |
581 | 581 | dol_syslog( |
582 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
582 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
583 | 583 | ); |
584 | 584 | } |
585 | 585 | |
586 | 586 | // Contracts |
587 | 587 | elseif ($action == 'CONTRACT_CREATE') { |
588 | 588 | dol_syslog( |
589 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
589 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
590 | 590 | ); |
591 | 591 | } elseif ($action == 'CONTRACT_MODIFY') { |
592 | 592 | dol_syslog( |
593 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
593 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
594 | 594 | ); |
595 | 595 | } elseif ($action == 'CONTRACT_ACTIVATE') { |
596 | 596 | dol_syslog( |
597 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
597 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
598 | 598 | ); |
599 | 599 | } elseif ($action == 'CONTRACT_CANCEL') { |
600 | 600 | dol_syslog( |
601 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
601 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
602 | 602 | ); |
603 | 603 | } elseif ($action == 'CONTRACT_CLOSE') { |
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 == 'CONTRACT_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 | elseif ($action == 'BILL_MODIFY') { |
614 | 614 | dol_syslog( |
615 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
615 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
616 | 616 | ); |
617 | 617 | |
618 | 618 | |
@@ -621,213 +621,213 @@ discard block |
||
621 | 621 | if (!empty($conf->global->INVOICE_USE_SITUATION) && $object->element == 'facture' && $object->type == Facture::TYPE_SITUATION) |
622 | 622 | { |
623 | 623 | $object->situation_final = 1; |
624 | - foreach($object->lines as $i => $line) { |
|
625 | - if(!TSubtotal::isModSubtotalLine($line) && $line->situation_percent != 100){ |
|
624 | + foreach ($object->lines as $i => $line) { |
|
625 | + if (!TSubtotal::isModSubtotalLine($line) && $line->situation_percent != 100) { |
|
626 | 626 | $object->situation_final = 0; |
627 | 627 | break; |
628 | 628 | } |
629 | 629 | } |
630 | 630 | // ne pas utiliser $object->setFinal ne peut pas marcher |
631 | - $sql = 'UPDATE ' . MAIN_DB_PREFIX . 'facture SET situation_final = ' . $object->situation_final . ' where rowid = ' . $object->id; |
|
632 | - $resql=$object->db->query($sql); |
|
631 | + $sql = 'UPDATE '.MAIN_DB_PREFIX.'facture SET situation_final = '.$object->situation_final.' where rowid = '.$object->id; |
|
632 | + $resql = $object->db->query($sql); |
|
633 | 633 | } |
634 | 634 | |
635 | 635 | |
636 | 636 | } elseif ($action == 'BILL_VALIDATE') { |
637 | 637 | dol_syslog( |
638 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
638 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
639 | 639 | ); |
640 | 640 | } elseif ($action == 'BILL_BUILDDOC') { |
641 | 641 | dol_syslog( |
642 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
642 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
643 | 643 | ); |
644 | 644 | } elseif ($action == 'BILL_SENTBYMAIL') { |
645 | 645 | dol_syslog( |
646 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
646 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
647 | 647 | ); |
648 | 648 | } elseif ($action == 'BILL_CANCEL') { |
649 | 649 | dol_syslog( |
650 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
650 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
651 | 651 | ); |
652 | 652 | } elseif ($action == 'BILL_DELETE') { |
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 == 'LINEBILL_INSERT') { |
657 | 657 | |
658 | 658 | dol_syslog( |
659 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
659 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
660 | 660 | ); |
661 | 661 | } elseif ($action == 'LINEBILL_DELETE') { |
662 | 662 | dol_syslog( |
663 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
663 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
664 | 664 | ); |
665 | 665 | } |
666 | 666 | |
667 | 667 | // Payments |
668 | 668 | elseif ($action == 'PAYMENT_CUSTOMER_CREATE') { |
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 == 'PAYMENT_SUPPLIER_CREATE') { |
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 == 'PAYMENT_ADD_TO_BANK') { |
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 | } elseif ($action == 'PAYMENT_DELETE') { |
681 | 681 | dol_syslog( |
682 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
682 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
683 | 683 | ); |
684 | 684 | } |
685 | 685 | |
686 | 686 | // Interventions |
687 | 687 | elseif ($action == 'FICHEINTER_CREATE') { |
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 == 'FICHEINTER_MODIFY') { |
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 | } elseif ($action == 'FICHEINTER_VALIDATE') { |
696 | 696 | dol_syslog( |
697 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
697 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
698 | 698 | ); |
699 | 699 | } elseif ($action == 'FICHEINTER_DELETE') { |
700 | 700 | dol_syslog( |
701 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
701 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
702 | 702 | ); |
703 | 703 | } |
704 | 704 | |
705 | 705 | // Members |
706 | 706 | elseif ($action == 'MEMBER_CREATE') { |
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 | } elseif ($action == 'MEMBER_VALIDATE') { |
711 | 711 | dol_syslog( |
712 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
712 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
713 | 713 | ); |
714 | 714 | } elseif ($action == 'MEMBER_SUBSCRIPTION') { |
715 | 715 | dol_syslog( |
716 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
716 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
717 | 717 | ); |
718 | 718 | } elseif ($action == 'MEMBER_MODIFY') { |
719 | 719 | dol_syslog( |
720 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
720 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
721 | 721 | ); |
722 | 722 | } elseif ($action == 'MEMBER_NEW_PASSWORD') { |
723 | 723 | dol_syslog( |
724 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
724 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
725 | 725 | ); |
726 | 726 | } elseif ($action == 'MEMBER_RESILIATE') { |
727 | 727 | dol_syslog( |
728 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
728 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
729 | 729 | ); |
730 | 730 | } elseif ($action == 'MEMBER_DELETE') { |
731 | 731 | dol_syslog( |
732 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
732 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
733 | 733 | ); |
734 | 734 | } |
735 | 735 | |
736 | 736 | // Categories |
737 | 737 | elseif ($action == 'CATEGORY_CREATE') { |
738 | 738 | dol_syslog( |
739 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
739 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
740 | 740 | ); |
741 | 741 | } elseif ($action == 'CATEGORY_MODIFY') { |
742 | 742 | dol_syslog( |
743 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
743 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
744 | 744 | ); |
745 | 745 | } elseif ($action == 'CATEGORY_DELETE') { |
746 | 746 | dol_syslog( |
747 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
747 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
748 | 748 | ); |
749 | 749 | } |
750 | 750 | |
751 | 751 | // Projects |
752 | 752 | elseif ($action == 'PROJECT_CREATE') { |
753 | 753 | dol_syslog( |
754 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
754 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
755 | 755 | ); |
756 | 756 | } elseif ($action == 'PROJECT_MODIFY') { |
757 | 757 | dol_syslog( |
758 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
758 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
759 | 759 | ); |
760 | 760 | } elseif ($action == 'PROJECT_DELETE') { |
761 | 761 | dol_syslog( |
762 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
762 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
763 | 763 | ); |
764 | 764 | } |
765 | 765 | |
766 | 766 | // Project tasks |
767 | 767 | elseif ($action == 'TASK_CREATE') { |
768 | 768 | dol_syslog( |
769 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
769 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
770 | 770 | ); |
771 | 771 | } elseif ($action == 'TASK_MODIFY') { |
772 | 772 | dol_syslog( |
773 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
773 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
774 | 774 | ); |
775 | 775 | } elseif ($action == 'TASK_DELETE') { |
776 | 776 | dol_syslog( |
777 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
777 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
778 | 778 | ); |
779 | 779 | } |
780 | 780 | |
781 | 781 | // Task time spent |
782 | 782 | elseif ($action == 'TASK_TIMESPENT_CREATE') { |
783 | 783 | dol_syslog( |
784 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
784 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
785 | 785 | ); |
786 | 786 | } elseif ($action == 'TASK_TIMESPENT_MODIFY') { |
787 | 787 | dol_syslog( |
788 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
788 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
789 | 789 | ); |
790 | 790 | } elseif ($action == 'TASK_TIMESPENT_DELETE') { |
791 | 791 | dol_syslog( |
792 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
792 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
793 | 793 | ); |
794 | 794 | } |
795 | 795 | |
796 | 796 | // Shipping |
797 | 797 | elseif ($action == 'SHIPPING_CREATE') { |
798 | 798 | dol_syslog( |
799 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
799 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
800 | 800 | ); |
801 | 801 | } elseif ($action == 'SHIPPING_MODIFY') { |
802 | 802 | dol_syslog( |
803 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
803 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
804 | 804 | ); |
805 | 805 | } elseif ($action == 'SHIPPING_VALIDATE') { |
806 | 806 | dol_syslog( |
807 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
807 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
808 | 808 | ); |
809 | 809 | } elseif ($action == 'SHIPPING_SENTBYMAIL') { |
810 | 810 | dol_syslog( |
811 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
811 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
812 | 812 | ); |
813 | 813 | } elseif ($action == 'SHIPPING_DELETE') { |
814 | 814 | dol_syslog( |
815 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
815 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
816 | 816 | ); |
817 | 817 | } elseif ($action == 'SHIPPING_BUILDDOC') { |
818 | 818 | dol_syslog( |
819 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
819 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
820 | 820 | ); |
821 | 821 | } |
822 | 822 | |
823 | 823 | // File |
824 | 824 | elseif ($action == 'FILE_UPLOAD') { |
825 | 825 | dol_syslog( |
826 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
826 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
827 | 827 | ); |
828 | 828 | } elseif ($action == 'FILE_DELETE') { |
829 | 829 | dol_syslog( |
830 | - "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
|
830 | + "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id |
|
831 | 831 | ); |
832 | 832 | } |
833 | 833 |
@@ -89,12 +89,14 @@ discard block |
||
89 | 89 | |
90 | 90 | if ($this->version == 'development') { |
91 | 91 | return $langs->trans("Development"); |
92 | - } elseif ($this->version == 'experimental') |
|
93 | - |
|
92 | + } elseif ($this->version == 'experimental') { |
|
93 | + |
|
94 | 94 | return $langs->trans("Experimental"); |
95 | - elseif ($this->version == 'dolibarr') return DOL_VERSION; |
|
96 | - elseif ($this->version) return $this->version; |
|
97 | - else { |
|
95 | + } elseif ($this->version == 'dolibarr') { |
|
96 | + return DOL_VERSION; |
|
97 | + } elseif ($this->version) { |
|
98 | + return $this->version; |
|
99 | + } else { |
|
98 | 100 | return $langs->trans("Unknown"); |
99 | 101 | } |
100 | 102 | } |
@@ -122,14 +124,18 @@ discard block |
||
122 | 124 | $subtotal_line_found = false; |
123 | 125 | foreach ($parent->lines as $k => &$line) |
124 | 126 | { |
125 | - if ($line->rang < $rang) continue; |
|
126 | - elseif ($line->rang == $rang) // Je suis sur la ligne de titre où je souhaite ajouter ma nouvelle ligne en fin de bloc |
|
127 | + if ($line->rang < $rang) { |
|
128 | + continue; |
|
129 | + } elseif ($line->rang == $rang) { |
|
130 | + // Je suis sur la ligne de titre où je souhaite ajouter ma nouvelle ligne en fin de bloc |
|
127 | 131 | { |
128 | 132 | $title_level = $line->qty; |
129 | 133 | } |
130 | - elseif (!$subtotal_line_found && $title_level > -1 && ($line->qty == 100 - $title_level)) // Le level de mon titre a été trouvé avant, donc maintenant je vais m'arrêter jusqu'à trouver un sous-total |
|
134 | + } elseif (!$subtotal_line_found && $title_level > -1 && ($line->qty == 100 - $title_level)) { |
|
135 | + // Le level de mon titre a été trouvé avant, donc maintenant je vais m'arrêter jusqu'à trouver un sous-total |
|
131 | 136 | { |
132 | 137 | $subtotal_line_found = true; |
138 | + } |
|
133 | 139 | $rang = $line->rang; |
134 | 140 | } |
135 | 141 | |
@@ -194,8 +200,11 @@ discard block |
||
194 | 200 | break; |
195 | 201 | } |
196 | 202 | |
197 | - if (!empty($conf->global->SUBTOTAL_ADD_LINE_UNDER_TITLE_AT_END_BLOCK)) $this->addToEnd($parent, $object, $rang); |
|
198 | - else $this->addToBegin($parent, $object, $rang); |
|
203 | + if (!empty($conf->global->SUBTOTAL_ADD_LINE_UNDER_TITLE_AT_END_BLOCK)) { |
|
204 | + $this->addToEnd($parent, $object, $rang); |
|
205 | + } else { |
|
206 | + $this->addToBegin($parent, $object, $rang); |
|
207 | + } |
|
199 | 208 | |
200 | 209 | } |
201 | 210 | |
@@ -216,8 +225,7 @@ discard block |
||
216 | 225 | if (!$is_supplier){ |
217 | 226 | $facture = new Facture($this->db); |
218 | 227 | $ret = $facture->fetch($object->fk_facture); |
219 | - } |
|
220 | - else |
|
228 | + } else |
|
221 | 229 | { |
222 | 230 | $facture = new FactureFournisseur($this->db); |
223 | 231 | $ret = $facture->fetch($object->fk_facture_fourn); |
@@ -228,14 +236,19 @@ discard block |
||
228 | 236 | $rang = !empty($subtotal_current_rang) ? $subtotal_current_rang : $object->rang; |
229 | 237 | // Si le fk_commande courrant est différent alors on change de commande => ajout d'un titre |
230 | 238 | if ($current_fk_commande != $subtotal_bloc_previous_fk_commande ) { |
231 | - if (!$is_supplier) $commande = new Commande($this->db); |
|
232 | - else $commande = new CommandeFournisseur($this->db); |
|
239 | + if (!$is_supplier) { |
|
240 | + $commande = new Commande($this->db); |
|
241 | + } else { |
|
242 | + $commande = new CommandeFournisseur($this->db); |
|
243 | + } |
|
233 | 244 | $commande->fetch($current_fk_commande); |
234 | 245 | |
235 | 246 | $label = $conf->global->SUBTOTAL_TEXT_FOR_TITLE_ORDETSTOINVOICE; |
236 | 247 | if (empty($label)) { |
237 | 248 | $label = 'Commande [__REFORDER__]'; |
238 | - if (!$is_supplier) $label .= ' - Référence client : [__REFCUSTOMER__]'; |
|
249 | + if (!$is_supplier) { |
|
250 | + $label .= ' - Référence client : [__REFCUSTOMER__]'; |
|
251 | + } |
|
239 | 252 | } |
240 | 253 | $label = str_replace(array('__REFORDER__', '__REFCUSTOMER__'), array($commande->ref, $commande->ref_client), $label); |
241 | 254 | |
@@ -276,7 +289,9 @@ discard block |
||
276 | 289 | |
277 | 290 | if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && in_array($action, array('LINEPROPAL_INSERT', 'LINEPROPAL_UPDATE', 'LINEORDER_INSERT', 'LINEORDER_UPDATE', 'LINEBILL_INSERT', 'LINEBILL_UPDATE', 'LINEBILL_SUPPLIER_CREATE', 'LINEBILL_SUPPLIER_UPDATE'))) |
278 | 291 | { |
279 | - if(! function_exists('_updateLineNC')) dol_include_once('/subtotal/lib/subtotal.lib.php'); |
|
292 | + if(! function_exists('_updateLineNC')) { |
|
293 | + dol_include_once('/subtotal/lib/subtotal.lib.php'); |
|
294 | + } |
|
280 | 295 | |
281 | 296 | $doli_action = GETPOST('action'); |
282 | 297 | $set = GETPOST('set'); |
@@ -294,32 +309,50 @@ discard block |
||
294 | 309 | $object->total_ht = $object->total_tva = $object->total_ttc = $object->total_localtax1 = $object->total_localtax2 = |
295 | 310 | $object->multicurrency_total_ht = $object->multicurrency_total_tva = $object->multicurrency_total_ttc = 0; |
296 | 311 | |
297 | - if ($object->element == 'propal') $res = $object->update(1); |
|
298 | - else $res = $object->update($user, 1); |
|
312 | + if ($object->element == 'propal') { |
|
313 | + $res = $object->update(1); |
|
314 | + } else { |
|
315 | + $res = $object->update($user, 1); |
|
316 | + } |
|
299 | 317 | |
300 | - if ($res > 0) setEventMessage($langs->trans('subtotal_update_nc_success')); |
|
318 | + if ($res > 0) { |
|
319 | + setEventMessage($langs->trans('subtotal_update_nc_success')); |
|
320 | + } |
|
301 | 321 | break; |
302 | 322 | } |
303 | 323 | } |
304 | 324 | |
305 | 325 | // $object correspond à la ligne ajoutée |
306 | - if(empty($object->array_options)) $object->fetch_optionals(); |
|
326 | + if(empty($object->array_options)) { |
|
327 | + $object->fetch_optionals(); |
|
328 | + } |
|
307 | 329 | |
308 | 330 | if(! empty($object->array_options['options_subtotal_nc'])) { |
309 | 331 | $object->total_ht = $object->total_tva = $object->total_ttc = $object->total_localtax1 = $object->total_localtax2 = |
310 | 332 | $object->multicurrency_total_ht = $object->multicurrency_total_tva = $object->multicurrency_total_ttc = 0; |
311 | 333 | |
312 | - if ($object->element == 'propaldet') $res = $object->update(1); |
|
313 | - else $res = $object->update($user, 1); |
|
334 | + if ($object->element == 'propaldet') { |
|
335 | + $res = $object->update(1); |
|
336 | + } else { |
|
337 | + $res = $object->update($user, 1); |
|
338 | + } |
|
314 | 339 | |
315 | - if ($res > 0) setEventMessage($langs->trans('subtotal_update_nc_success')); |
|
340 | + if ($res > 0) { |
|
341 | + setEventMessage($langs->trans('subtotal_update_nc_success')); |
|
342 | + } |
|
316 | 343 | } |
317 | 344 | |
318 | 345 | // Correction d'un bug lors de la création d'une commande depuis une propale qui a, au moins, une ligne NC |
319 | 346 | $parent_element = ''; |
320 | - if($object->element == 'propaldet') $parent_element = 'propal'; |
|
321 | - if($object->element == 'commandedet') $parent_element = 'commande'; |
|
322 | - if($object->element == 'facturedet') $parent_element = 'facture'; |
|
347 | + if($object->element == 'propaldet') { |
|
348 | + $parent_element = 'propal'; |
|
349 | + } |
|
350 | + if($object->element == 'commandedet') { |
|
351 | + $parent_element = 'commande'; |
|
352 | + } |
|
353 | + if($object->element == 'facturedet') { |
|
354 | + $parent_element = 'facture'; |
|
355 | + } |
|
323 | 356 | |
324 | 357 | if(! empty($parent_element) && ! empty($object->array_options['options_subtotal_nc'])) { |
325 | 358 | _updateLineNC($parent_element, $object->{'fk_'.$parent_element}, $object->id, $object->array_options['options_subtotal_nc'], 1); |
@@ -519,26 +552,38 @@ discard block |
||
519 | 552 | ); |
520 | 553 | |
521 | 554 | // En fonction de l'objet et de la version, les lignes conservent l'id de l'objet d'origine |
522 | - if (method_exists($object, 'fetch_lines')) $object->fetch_lines(); |
|
523 | - else $object->fetch($object->id); |
|
555 | + if (method_exists($object, 'fetch_lines')) { |
|
556 | + $object->fetch_lines(); |
|
557 | + } else { |
|
558 | + $object->fetch($object->id); |
|
559 | + } |
|
524 | 560 | |
525 | 561 | foreach ($object->lines as &$line) |
526 | 562 | { |
527 | - if (empty($line->array_options)) $line->fetch_optionals(); |
|
563 | + if (empty($line->array_options)) { |
|
564 | + $line->fetch_optionals(); |
|
565 | + } |
|
528 | 566 | |
529 | 567 | if (!TSubtotal::isModSubtotalLine($line) && !empty($line->array_options['options_subtotal_nc'])) |
530 | 568 | { |
531 | 569 | $line->total_ht = $line->total_tva = $line->total_ttc = $line->total_localtax1 = $line->total_localtax2 = |
532 | 570 | $line->multicurrency_total_ht = $line->multicurrency_total_tva = $line->multicurrency_total_ttc = 0; |
533 | 571 | |
534 | - if ($line->element == 'propaldet') $res = $line->update(1); |
|
535 | - else $res = $line->update($user, 1); |
|
572 | + if ($line->element == 'propaldet') { |
|
573 | + $res = $line->update(1); |
|
574 | + } else { |
|
575 | + $res = $line->update($user, 1); |
|
576 | + } |
|
536 | 577 | |
537 | - if ($res > 0) setEventMessage($langs->trans('subtotal_update_nc_success')); |
|
578 | + if ($res > 0) { |
|
579 | + setEventMessage($langs->trans('subtotal_update_nc_success')); |
|
580 | + } |
|
538 | 581 | } |
539 | 582 | } |
540 | 583 | |
541 | - if (!empty($line)) $object->update_price(1); |
|
584 | + if (!empty($line)) { |
|
585 | + $object->update_price(1); |
|
586 | + } |
|
542 | 587 | } |
543 | 588 | |
544 | 589 | } elseif ($action == 'PROPAL_MODIFY') { |
@@ -608,9 +653,7 @@ discard block |
||
608 | 653 | dol_syslog( |
609 | 654 | "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
610 | 655 | ); |
611 | - } |
|
612 | - |
|
613 | - elseif ($action == 'BILL_MODIFY') { |
|
656 | + } elseif ($action == 'BILL_MODIFY') { |
|
614 | 657 | dol_syslog( |
615 | 658 | "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id |
616 | 659 | ); |