2
0
forked from Wavyzz/dolibarr
Commit Graph

134272 Commits

Author SHA1 Message Date
Laurent Destailleur
082195b249 Fix #yogosha21569 2024-04-09 18:49:48 +02:00
Laurent Destailleur
ebe8f25193 Fix #yogosha21561 2024-04-09 17:46:13 +02:00
Laurent Destailleur
e293dc6cad Fix example 2024-04-09 16:21:15 +02:00
Laurent Destailleur
3f5c5e3f68 More complete example 2024-04-09 15:35:57 +02:00
Laurent Destailleur
605e07ca3a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-04-09 15:30:01 +02:00
Laurent Destailleur
345a315b50 Fix example of security options 2024-04-09 15:29:43 +02:00
Laurent Destailleur
4bcbe4ebb1 CSS 2024-04-09 04:03:23 +02:00
Laurent Destailleur
46e21a0b2d Removed dead code 2024-04-09 03:50:46 +02:00
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
Bradley Jarvis
58e0837a7a FIX Add CSV download link to stock at date table (#29016)
* FIX Add CSV download link to stock at date table

* Update array values to strings for joining

* Fix array and string formatting

* Fix space after comma

* FIX stock at date csv download

Removed .htaccess and requirement for modrewrite
Added output url parameter which takes csv as argument
updated GETPOST(,'int') calls to GETPOSTINT()

* FIX stock at date csv download

Removed .htaccess and requirement for modrewrite
Added output url parameter which takes csv as argument
updated GETPOST(,'int') calls to GETPOSTINT()

* FIX removed extra 'int' parameter from GETPOSTINT()

* Fix wrapped stock values in price(price2num($stock,'MS'))

* Fix error in php code

* Fix missed wrapping some stock levels tin price(...)

* Update stockatdate.php

---------

Co-authored-by: brad <brad@endurotags.com.au>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-04-09 02:37:30 +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
Lucas Noirie
4aca06174c CLOSE|Close #29274 Add possibility to have different mail for autocopy for holiday (#29275)
* Add handdling of multiple autocopy mail to in CMailFile class __construct function

* Change mail to autocopy to for leaves

* Remove new param and set $sendtobcc to MAIN_MAIL_AUTOCOPY_HOLIDAY_TO
2024-04-08 23:13:04 +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
sonikf
672ba6f47d QUAL: feature parity between vendor and customer template invoice (#26588)
* NEW: Add invoice subtype

* Add subtype, propagate extrafields and clean up

* fix empty line

* fix phan error
2024-04-08 20:36:12 +02:00
Laurent Destailleur
39491976e1 Fix title 2024-04-08 19:26:37 +02:00
Laurent Destailleur
7ca303888d Look and feel v20 2024-04-08 19:20:07 +02:00
Laurent Destailleur
9771370fc1 FIX Color must not be saved with the # char 2024-04-08 18:47:41 +02:00
Laurent Destailleur
dc77cf736d Fix css 2024-04-08 18:42:11 +02:00
Laurent Destailleur
b6822272b3 Look and feel 2024-04-08 16:37:33 +02:00
Laurent Destailleur
1a007c7cbd Clean code 2024-04-08 15:13:19 +02:00
Laurent Destailleur
f1a3df108f Fix thumbs replace by opencollective 2024-04-08 14:59:21 +02:00
Laurent Destailleur
3215fa1184 Try to add stats fro ossinsight 2024-04-08 14:30:44 +02:00
Laurent Destailleur
1cced0d841 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-04-08 14:00:28 +02:00
Laurent Destailleur
ea1c9ad11d Fix grouping of security alerts 2024-04-08 14:00:13 +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
Laurent Destailleur
35908a2aad Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-04-08 12:35:09 +02:00
Laurent Destailleur
db65c11981 FIX #28541 FIX #29240 trunc barcode to avoid trespass on fichhalfright 2024-04-08 12:34:46 +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
ab53b275eb Fix default value 2024-04-08 12:09:05 +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
G-ladal
e00b5a5c6a Add multicompany support to bookcal (+title typo) (#29251)
* Add multicompany support to bookcal (+title typo)

* Delete comments

* typos

* typos

* last code typo

* The count must match the result of select

* Update availabilities.class.php

* Update availabilities.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-04-08 11:38:00 +02:00
Laurent Destailleur
fa520942f1 Use getDolGlobalString 2024-04-08 11:31:28 +02:00
Laurent Destailleur
9427addc39 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-04-08 11:19:56 +02:00
Laurent Destailleur
fa7bcc35db Fix name of constant MAIN_MAIL_SMS_FROM must be MAIN_SMS_FROM 2024-04-08 11:19:43 +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
Mohamed DAOUD
fcabb3d37f insert fields order (#29272) 2024-04-08 11:02: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
Laurent Destailleur
40815ec24b Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-04-08 02:55:00 +02:00
Laurent Destailleur
330d20813e Fix #29028 Fix #29163 Md-theme - Login is on other icons 2024-04-08 02:54:01 +02:00
Laurent Destailleur
bc8e4c19cc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-04-07 15:06:46 +02:00
MDW
4d496209ce Qual: Phan/apstats should not be using the standard baseline (#29267)
# Qual: Phan/apstats should not be using the standard baseline

Fix to get apstats reporting on the technical debt.  The 'baseline.txt'
is for the ci regression.  The code is changed to allow a
'baseline_extended.txt' which should not be generated, only hand-crafted
2024-04-07 15:02:00 +02:00
Frédéric FRANCE
95eb1abf2e clean code (#29268) 2024-04-07 15:01:29 +02:00
Laurent Destailleur
b5de782c6b Fix use the good HTTP code 2024-04-07 14:59:25 +02:00
Frédéric FRANCE
97240a05b0 fix phpdoc (#29266) 2024-04-07 14:17:50 +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