Commit Graph

27554 Commits

Author SHA1 Message Date
Laurent Destailleur
1fc29d6d40 Missing token 2022-06-02 14:26:57 +02:00
Laurent Destailleur
43dedcb2b1 # WARNING: head commit changed in the meantime
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-06-01 22:29:29 +02:00
Laurent Destailleur
1a51a7d525 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-01 22:14:02 +02:00
Laurent Destailleur
d3fed26d78 # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-06-01 22:13:42 +02:00
Laurent Destailleur
ff450e57fd
Merge branch 'develop' into patch-198 2022-06-01 22:05:03 +02:00
Laurent Destailleur
731702c7eb Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-01 22:01:47 +02:00
Laurent Destailleur
958833484f Fix bad var 2022-06-01 22:01:03 +02:00
Laurent Destailleur
cbd12288d3
Merge pull request #21067 from bb2a/php-V8-warning-class-commonobject
php V8 warning class commonobject
2022-06-01 21:28:22 +02:00
Laurent Destailleur
d2a8dd6925
Merge pull request #21065 from bb2a/FIX-PHP8-files-lib
php V8 warning files lib
2022-06-01 20:58:44 +02:00
Laurent Destailleur
f89892f7e4
Merge pull request #21069 from bb2a/php-V8-warning-class-html-form
php V8 warning class html form
2022-06-01 20:58:22 +02:00
Laurent Destailleur
e641bef40a
Merge pull request #21080 from bb2a/FIX---php-V8-warning-lib-usergroups-topmenu
FIX - php V8 warning lib usergroups topmenu select
2022-06-01 19:56:51 +02:00
Laurent Destailleur
c88ee425ad
Merge pull request #21087 from Hystepik/develop#3
New : update in import for socialnetworks
2022-06-01 19:40:54 +02:00
Laurent Destailleur
3dcd9fcfe9
Merge pull request #21086 from Hystepik/develop#2
Fix: import update on xlsx
2022-06-01 19:40:08 +02:00
Laurent Destailleur
e3fa24fab2
Merge pull request #18283 from atm-gauthier/NEW_stockstransfers
NEW : Stocks transfers objects management
2022-06-01 14:49:21 +02:00
Gauthier PC portable 024
2a3f0affaf FIX : try for travis 2022-06-01 14:13:24 +02:00
lmarcouiller
69e8c1abe4 New : update in import for socialnetworks 2022-06-01 11:44:07 +02:00
lmarcouiller
d345957b84 Fix: import update on xlsx 2022-06-01 11:36:47 +02:00
BB2A Anthony Berton
976f6d42b8 php V8 warning 2022-06-01 09:15:21 +02:00
Laurent Destailleur
21e5189e18 Add phpunit for num2Alpha 2022-05-31 18:17:43 +02:00
Laurent Destailleur
a253938db9 Better error message 2022-05-31 18:08:53 +02:00
Laurent Destailleur
5ada47195a FIX Link to social network 2022-05-31 15:48:50 +02:00
Laurent Destailleur
d6ecbe65b7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/langs/en_US/errors.lang
2022-05-31 15:16:54 +02:00
Laurent Destailleur
64a683c8e7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/projet/tasks/task.php
2022-05-31 14:33:19 +02:00
Laurent Destailleur
72b36b5a69 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-31 14:31:20 +02:00
Laurent Destailleur
c9eda09964 FIX ODT generation of BOM document 2022-05-31 14:30:47 +02:00
Laurent Destailleur
0b9d4de20d Fix warning 2022-05-31 14:20:59 +02:00
BB2A Anthony Berton
d917ac46e7 php V8 warning class html form 2022-05-31 14:14:22 +02:00
BB2A Anthony Berton
d7eebeb913 php V8 warning class commonobject 2022-05-31 11:41:38 +02:00
BB2A Anthony Berton
e303f27a19 FIX PHP8 2022-05-31 11:36:23 +02:00
Laurent Destailleur
1655890f84 Debug v16 2022-05-31 10:35:36 +02:00
Laurent Destailleur
b95440b83f Fix picto phone 2022-05-31 09:57:49 +02:00
Gauthier PC portable 024
8b4054f8e9 FIX : missing phpcs:enable 2022-05-30 17:22:25 +02:00
BENKE Charlene
d74fc672e7
Update files.lib.php 2022-05-30 10:23:00 +02:00
BENKE Charlene
785d0e03b7
php V8 warning 2022-05-30 08:43:41 +02:00
Laurent Destailleur
0dda1d7e76
Merge pull request #20814 from atm-gauthier/NEW/develop_update_on_categorie_product_link_table
New/develop update on categorie product link table
2022-05-29 11:30:26 +02:00
Laurent Destailleur
f5da6ebfe2
Merge pull request #21036 from OPEN-DSI/14.0_fix_show_category_on_sellist_extrafields
FIX: Show sellist type of extrafield when none category selected
2022-05-29 11:24:35 +02:00
Laurent Destailleur
dc3121dc42
Merge pull request #21043 from defrance/patch-194
php V8 warning ($conf->global-b*)
2022-05-29 10:52:50 +02:00
Laurent Destailleur
a56a6abb20
Merge pull request #21045 from defrance/patch-196
fix php V8 warning
2022-05-29 10:50:18 +02:00
Laurent Destailleur
480452e291 FIX missing filters 2022-05-29 10:35:49 +02:00
Laurent Destailleur
61b69ca835 FIX repeating error "token expired" 2022-05-29 09:37:03 +02:00
Laurent Destailleur
23eb0b3264 Clean code 2022-05-28 21:07:52 +02:00
Laurent Destailleur
f6ad688ddd FIX module for emailing target selection must use a condition on module 2022-05-28 20:50:24 +02:00
Laurent Destailleur
a961bb5507 Debug v16 2022-05-28 11:31:41 +02:00
BENKE Charlene
4c96921a5f
php 8 fix warning 2022-05-28 09:54:59 +02:00
BENKE Charlene
d36175c523
php V8 warning 2022-05-27 16:23:57 +02:00
Laurent Destailleur
b93b9a784c Trans 2022-05-26 00:30:35 +02:00
Laurent Destailleur
2b5e21379b Fix phpcs 2022-05-25 23:54:03 +02:00
Laurent Destailleur
343056dcbd Debug v16 2022-05-25 23:43:16 +02:00
Laurent Destailleur
271fb43bc6 FIX Import of fk_stcomm 2022-05-25 23:08:53 +02:00
Laurent Destailleur
571110f60a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2022-05-25 23:04:58 +02:00