Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
134,272 Commits 36 Branches 189 Tags
082195b249da3da052d85bdd44db8931c4d085ee
Commit Graph

35496 Commits

Author SHA1 Message Date
Laurent Destailleur
b172640ae5 Debug v20 2024-04-09 03:38:38 +02:00
jyhere
4880ec1b77 NEW: Hooks tab in debugbar (#24992) 
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-04-09 03:09:10 +02:00
Jon Bendtsen
56c198992d Fix #29279 Not admin that can create group have disabled button for group creation (#29286) 
* Fix #29279 Not admin that can create group have disabled button for group creation

* Update eldy.lib.php

---------

Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-04-09 02:26:07 +02:00
Francis Appels
e23ccabf36 Fix PR #28989, create shipment line (#29281) 
* Fix PR #28989, create shipment line

* Fix Phan

* Update changelog

* Fix stan

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-04-08 23:10:58 +02:00
Regis Houssin
1f512873ff FIX phan error (#29283) 2024-04-08 22:48:33 +02:00
Lucas Marcouiller
232800d776 NEW feature to merge 2 tasks (#29214) 
* first push select not saved

* add working merge

* ass merge of contact for task

* fix typo

* add of merge timespent

* Fix integration error + use of good SelectTasks

* fix precommit

* Fix CI

* fix CI

* fix bad change

* fix to make merge only an update

* remove useless field update

* fix empty array

* fix CI

* fix unused code

---------

Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
 2024-04-08 20:50:16 +02:00
Laurent Destailleur
7ca303888d Look and feel v20 2024-04-08 19:20:07 +02:00
Zephyriony
6f524405af QUAL Rename column fk_origin_line on shipment lines into fk_elementdet to match a generic use. (#28989) 
* Update expedition.class.php 

Adapting the query and code to the new table format

* Update llx_expeditiondet.sql

* Update expedition.class.php

* Update expedition.class.php

* Update expedition.class.php

* Update expedition.class.php

* Update expedition.class.php

* Update expedition.class.php

* Update expedition.class.php

* Update expedition.class.php

* Update expedition.class.php

* Update llx_expeditiondet.sql

* Update expedition.class.php

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* Update expedition.class.php

* Update expedition.class.php

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* Update 19.0.0-20.0.0.sql

---------

Co-authored-by: sonikf <93765174+sonikf@users.noreply.github.com>
 2024-04-08 12:44:49 +02:00
Charlène Benke
e4657c6b03 MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES error (#29010) 
* MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES error

if we enable MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES we disable the native contact tabs

* Update companies.lang

* Update companies.lang

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-04-08 12:13:38 +02:00
Laurent Destailleur
b9b097057a Fix subtype must be visible only for countries that need subtype 
invoices
 2024-04-08 12:02:31 +02:00
Laurent Destailleur
7f780fcb57 It seems constant are for storing data only and used for 
DolibarrModules.class.php file only (main code shoud only use
->hasRight), so i try to move them.
 2024-04-08 11:53:49 +02:00
Regis Houssin
68eb5e409a NEW module user rights enhancement (#29150) 
* NEW module user rights enhancement

* FIX syntax error

* FIX fuck

* FIX syntax error

* FIX Add label with the current language (key or with PermissionXXX)

* FIX wrong test

* FIX optimize

* FIX doc

* FIX add class "Rights" for constant

* FIX replace with constants

* FIX missing constant

* FIX wrong check

* TODO sql error : data too long for column 'libelle'

* FIX syntax error

* FIX synax error "the return"... i'll be back

* FIX use operator with double question mark

* FIX add comment

* FIX just remplace integer with constant

* FIX remove unused code

* FIX add an example

* FIX remove the possibility to have entity = 0 (too complicated)

* FIX perms must not be empty

* FIX sql syntax error

* FIX phpstan undefined property DolibarrModules::$modules

* FIX same fix of frederic34

* Update llx_rights_def.sql

* Update DolibarrModules.class.php

* Update DolibarrModules.class.php

* Update DolibarrModules.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-04-08 11:40:02 +02:00
Laurent Destailleur
fa520942f1 Use getDolGlobalString 2024-04-08 11:31:28 +02:00
Jon Bendtsen
1207ce21cc NEW: API setup delete extrafields from name and elementtype v2 (#29269) 
* NEW: API delete extrafields from name and elementtype

* 401 came back, but was 403'ed again

* Fix sql injection

---------

Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-04-08 11:11:53 +02:00
Laurent Destailleur
0a48d1ad56 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2024-04-08 03:38:04 +02:00
Jon Bendtsen
b586f90f59 Qual: 4 functions with hardcoded elementtype = 'member' replaced with elementtype = '' (#29256) 
Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>
 2024-04-07 12:35:40 +02:00
Laurent Destailleur
3fad52815a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-04-07 12:26:49 +02:00
Laurent Destailleur
fd9475be03 Use same doc comment eveywhere. 2024-04-07 12:26:27 +02:00
PsyCrow
01d82614b6 PHP warning on updating html type extrafield (#29260) 
FIX: #29229
 2024-04-07 12:03:24 +02:00
MDW
bbde552979 Qual: Enable Phan Rules and update baseline (#29255) 
* Fix script generating trailing whitespace

* Add nusoap as a stub for better analysis

* Qual: Return type for fetch_name_optionals_label to fix phan message

* Qual: Enable Phan Rules and update baseline

# Qual: Enable Phan Rules and update baseline

This enables all of the rules that are currently also
enabled for cti, but sets the baseline to ignore the
exceptions already present.
This will help detect exceptions added by code modifications
if the rule is not ignored for the given file.
 2024-04-07 11:55:39 +02:00
Frédéric FRANCE
00b2185813 fix phpstan (#29258) 
* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan
 2024-04-07 11:50:26 +02:00
Frédéric FRANCE
7cf6a0821f fix phpdoc for ismultientitymanaged (#29245) 
* fix phpdoc

* fix

* fix

* fix

* fix

* fix

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-04-06 17:38:39 +02:00
Frédéric FRANCE
87b76db460 fix phpdoc (#29246) 2024-04-06 13:35:04 +02:00
Laurent Destailleur
0e5440f256 Fix bad var 2024-04-06 13:33:42 +02:00
atm-irvine
660bb7bd5c FIX: Undefined array key default on fields (#29243) 2024-04-06 13:30:28 +02:00
Laurent Destailleur
2ca5518625 Fix use of dynamic property conf->xxx->enabled must be abandonned. 2024-04-05 16:51:27 +02:00
Florian Mortgat
8b00b89f9d FIX: $conf must reflect enabled/disabled state of modules (#29126) 2024-04-05 16:36:02 +02:00
Laurent Destailleur
38fb00489d PHPDoc 2024-04-05 13:44:59 +02:00
Laurent Destailleur
7c5b2dae56 Fix GETPOSTINT 2024-04-05 13:09:32 +02:00
Laurent Destailleur
c074a8525d Merge pull request #29233 from thibdrev/patch-1 
qual: phpstan for htdocs/eventorganization/class/conferenceorbooth.class.php
 2024-04-05 10:32:41 +02:00
Laurent Destailleur
e36e70ecfe Fix typo formated -> formatted 2024-04-05 10:17:00 +02:00
thibdrev
2302708c98 typo 2024-04-04 20:51:46 +02:00
thibdrev
0dc1527064 Update commonobject.class.php 2024-04-04 20:49:16 +02:00
Laurent Destailleur
6ef81a05dc typo 2024-04-04 19:13:12 +02:00
Laurent Destailleur
0be59cf384 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-04-04 17:56:27 +02:00
Laurent Destailleur
8e6674ff6f Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-04-04 17:56:06 +02:00
Laurent Destailleur
d10d5aed72 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-04-04 17:54:59 +02:00
Laurent Destailleur
e407588231 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-04-04 17:54:31 +02:00
Laurent Destailleur
65f2425902 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-04-04 17:51:55 +02:00
Laurent Destailleur
28075f7cf8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-04-04 17:51:37 +02:00
Laurent Destailleur
bf7109f51c Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-04-04 17:47:02 +02:00
Laurent Destailleur
16f4f4a661 FIX Button for disabled modules must not appear. 2024-04-04 17:26:45 +02:00
Laurent Destailleur
0abb129793 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-04-04 16:52:59 +02:00
Laurent Destailleur
d4268de403 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-04-04 16:52:38 +02:00
Laurent Destailleur
115be29078 Merge pull request #29227 from hregis/fix_dev_phan_error2 
FIX phan error PhanTypeMismatchReturnNullable
 2024-04-04 16:39:47 +02:00
Laurent Destailleur
5cd0456e9e Fix doxygen 2024-04-04 16:35:21 +02:00
Regis Houssin
cb9a93d97e FIX syntax error (but same result) :-) 2024-04-04 16:32:24 +02:00
Regis Houssin
9e638ccc12 FIX avoid to delete "lock" and "unlock" files 2024-04-04 16:22:31 +02:00
Laurent Destailleur
0fec23f437 Update html.formprojet.class.php 2024-04-04 16:09:19 +02:00
Benjamin Falière
ddacb21a44 NEW: constant MAIN_DISCARD_CLOSED_PROJECTS_IN_SELECT 2024-04-04 15:41:08 +02:00