Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
146,825 Commits 36 Branches 189 Tags
a3ee1b0c110b146a966fc8928b8344e77a2079cf
Commit Graph

912 Commits

Author SHA1 Message Date
Laurent Destailleur
2649093815 Fix php 7.1 compatibility 2023-10-30 14:06:25 +01:00
William Mead
3c87423364 Qual cleaner code for InterfaceLogevents (#26347) 
* Renamed text variable to label

* Added label variable

* Fixed typos

* Fixed PHPDoc

* Added runTrigger method return type

* Refactored to use super class constructor

* Added contributor details. Cleaned indentation.

* Added user login failed string

* Added label & description localized strings

* Converted event label, description & date variables to class properties. Added class method to initialize event data. Refactored & cleaned code.

* Added user string parameter

* Cleaned code

* Moved langs loading

* Added code comment

* Cleaned code

* Added code comment

* Fixed PHPDoc comments

* Refactored event label & description assignment

* Deleted unneeded empty lines

* Added event action text dictionary. Refactored event data initialization. Added static class method for dynamic localization to check if event text has an event action key n.

* Updated string parameter placement

* Added condition to check if event description has an event action key in order to do dynamic frontend translation

* Updated code comments. Renamed event action array.

* Added user status key

* Cleaned code

* Update interface_20_all_Logevents.class.php

---------

Co-authored-by: William Mead <william.mead@manchenumerique.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-10-30 04:12:43 +01:00
Laurent Destailleur
8333410ca1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-10-28 00:07:17 +02:00
Alexandre Janniaux
a7619ecc92 Workflow: code quality with early return (#26365) 
* workflow: use setErrorsFromObject when suitable

* workflow: shipping: use early return in for loop

* workflow: shipping: combine to previous early return

* workflow: shipping: reindent after last changes

No functional changes.

* workflow: reception: use early return when suitable

* workflow: reception: use early return

* workflow: reception: reindent after last changes

No functional changes.

* workflow: ticket: use early return

* workflow: ticket: combine condition through an early return

* workflow: ticket: reindent after last changes

No functional changes.

* workflow: propal: remove else condition after terminal if

* Update interface_20_modWorkflow_WorkflowManager.class.php

* Update interface_20_modWorkflow_WorkflowManager.class.php

* Update interface_20_modWorkflow_WorkflowManager.class.php

* Update interface_20_modWorkflow_WorkflowManager.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-10-27 19:17:27 +02:00
Laurent Destailleur
ca3c7f0a37 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-10-26 13:52:22 +02:00
Laurent Destailleur
7e994e4439 Fix error message 2023-10-24 19:45:56 +02:00
Laurent Destailleur
69e7a76aee Fix log level 2023-10-24 19:28:28 +02:00
Laurent Destailleur
8ea84c5bb5 FIX error of webhook not returned 2023-10-24 19:27:04 +02:00
William Mead
08f17dab0b Qual logevents action switch (#26330) 
* QUAL use switch case instead of if elseif statements for actions

* Deleted unnecessary action comments

* Added default case

* Added contributor details

---------

Co-authored-by: William Mead <william.mead@manchenumerique.fr>
 2023-10-23 18:58:57 +02:00
William Mead
b0a7332e8f FIX intervention closed agenda action message (#26294) 
Co-authored-by: William Mead <william.mead@manchenumerique.fr>
 2023-10-20 12:59:48 +02:00
Laurent Destailleur
0fbffea663 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-17 14:49:16 +02:00
Laurent Destailleur
15e927be31 FIX Bad name for trigger in HRM module 2023-10-17 14:46:51 +02:00
Laurent Destailleur
1f38e54e78 Clean code 2023-10-15 15:32:35 +02:00
Laurent Destailleur
946239dbf3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-10 23:04:47 +02:00
Regis Houssin
5476725066 FIX missing load group members for ldap synchro (#26167) 
* FIX missing load group members for ldap synchro

* FIX missing load group members during fetch group
 2023-10-10 18:37:50 +02:00
Dev2a
b76c402a09 Fix: Change access to $conf->global to function getDolGlobal (manual) 2023-10-08 23:25:46 +02:00
Laurent Destailleur
3cb78be3ac Clean code 2023-09-29 16:27:07 +02:00
Laurent Destailleur
7bbc3bab05 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-27 17:17:41 +02:00
Laurent Destailleur
c40bb198ca Add log info to help debug trouble with object changing entity 2023-09-22 13:16:07 +02:00
Laurent Destailleur
3343a47244 NEW billing on shipment+reception. Can be done before or after delivery. 2023-09-03 21:38:11 +02:00
Laurent Destailleur
82f69c68b1 Fix bad var 2023-09-03 20:23:58 +02:00
Frédéric FRANCE
8ef2167f91 phpstan 2023-08-27 09:40:55 +02:00
Laurent Destailleur
bf1549e6e0 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-24 00:14:55 +02:00
Francis Appels
71e145d852 Merge remote-tracking branch 'Dolibarr/18.0' into 18_fix_mass_bill_reception 2023-08-22 10:18:44 +02:00
Francis Appels
c06282358c Fix validate supplier invoice should also set closed reception billed. Related to #25530 2023-08-22 10:16:12 +02:00
Laurent Destailleur
08258bce30 Merge pull request #25632 from frederic34/develop-1 
doc
 2023-08-19 12:06:35 +02:00
Laurent Destailleur
fb4e772e0a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-16 18:08:21 +02:00
Laurent Destailleur
61a319f790 NEW Perf avoid 2 useless fetch into the triggers of agenda. 2023-08-16 17:57:41 +02:00
Frédéric FRANCE
30ed164074 Update interface_20_modWorkflow_WorkflowManager.class.php 2023-08-16 11:53:08 +02:00
Frédéric FRANCE
460e229407 doc 2023-08-16 11:50:18 +02:00
Laurent Destailleur
59e380ee8f Merge pull request #25602 from altairisfr/fixdelivered 
FIX : avoid draft and cancelled shippings when searching if order should be set delivered
 2023-08-16 02:28:15 +02:00
Laurent Destailleur
b1e1eecf24 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-15 00:31:51 +02:00
Laurent Destailleur
a329abb1dd Fix warning 2023-08-15 00:29:14 +02:00
Laurent Destailleur
4445d9b489 Debug v18 - audit event not completely saved. Fix warnings 2023-08-14 21:43:24 +02:00
Christophe Battarel
5f1bbc602e avoid draft shippings when searching if order should be flagged as delivered 2023-08-09 17:04:59 +02:00
Laurent Destailleur
04b7b0aaa6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-08-09 15:02:34 +02:00
Laurent Destailleur
5b13065bd8 Merge pull request #25503 from dolibit-ut/patch-727 
Update interface_20_all_Logevents.class.php
 2023-08-09 13:22:47 +02:00
Laurent Destailleur
10e2a35aa6 Update interface_20_all_Logevents.class.php 2023-08-09 13:21:56 +02:00
Laurent Destailleur
91982253a0 Clean code 2023-08-05 14:59:31 +02:00
Laurent Destailleur
3f8e343b10 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-05 14:10:42 +02:00
Laurent Destailleur
8646b826e0 Debug v18 2023-08-05 14:09:11 +02:00
antonin_tdj
a00045b94c Check was after submit (#25551) 
Check was added in the wrong place. 
I moved it a few lines before.
 2023-08-02 19:16:47 +02:00
Laurent Destailleur
49e63e1d38 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-08-01 19:17:09 +02:00
antonin_tdj
8c3c607225 NEW LDAP Active Directory UserAccountControl (#25507) 
* fix ldapGroup

* add default userAccountControl to admin

* add const on activation

* update triggers create and enable/disable

---------

Co-authored-by: amarchal <antonin@letempledujeu.fr>
 2023-08-01 18:20:51 +02:00
Laurent Destailleur
016ab20155 Fix warning 2023-07-31 03:52:05 +02:00
Florent Poinsaut
cdc8bc1b6f FIX add notification hook to allow external module trigger (#25506) 2023-07-31 01:54:49 +02:00
UT from dolibit
155848585f Update interface_20_all_Logevents.class.php 
$langs->load("users");     only once at the start
 2023-07-27 13:16:00 +02:00
jyhere
fe09500e91 FIX: workflow for closing supplier order dn't work (wrong source type) (#25407) 
* FIX: workflow for closing supplier order dn't work (wrong source type)

* FIX: sql error when passing origin and origin id, no need to pass theses values

$object->origin is set to "commandeFournisseur', and it's definitively not working with the setStatus method.
SQL error : Table 'dolibarr.llx_commandeFournisseur' doesn't exist

I suppose origin should never be set to commandeFournisseur, but 'order_supplier' instead. Also, setStatus() $elementType is meant to be a table_element value, not an element value.

* Update interface_20_modWorkflow_WorkflowManager.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-07-23 21:47:13 +02:00
jyhere
c38651075e FIX: workflow for closing supplier order dn't work (wrong source type) (#25407) 
* FIX: workflow for closing supplier order dn't work (wrong source type)

* FIX: sql error when passing origin and origin id, no need to pass theses values

$object->origin is set to "commandeFournisseur', and it's definitively not working with the setStatus method.
SQL error : Table 'dolibarr.llx_commandeFournisseur' doesn't exist

I suppose origin should never be set to commandeFournisseur, but 'order_supplier' instead. Also, setStatus() $elementType is meant to be a table_element value, not an element value.

* Update interface_20_modWorkflow_WorkflowManager.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-07-23 21:44:20 +02:00
Laurent Destailleur
43a38904f3 Merge pull request #25225 from ATM-Consulting/fix_18.0_php8.2_fatal_in_blockedlog 
float casting empty value
 2023-06-30 20:07:01 +02:00