Commit Graph

109491 Commits

Author SHA1 Message Date
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
11ede876bb
Merge pull request #21089 from atm-quentin/FIX_empty_password
FIX If the password does not match the rules, Dolibarr creates a user without a password
2022-06-01 19:35:41 +02:00
Laurent Destailleur
1ef66c208f
Update card.php 2022-06-01 19:34:29 +02:00
Laurent Destailleur
a667232739
Merge pull request #21091 from Hystepik/develop#5
Fix #20878 : improper use of dol_move
2022-06-01 16:20:28 +02:00
Laurent Destailleur
37ea95eb3a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-01 16:04:25 +02:00
Laurent Destailleur
0bb7defa88 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
	htdocs/projet/card.php
2022-06-01 16:04:11 +02:00
Laurent Destailleur
32f60e191f Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-06-01 15:57:35 +02:00
Laurent Destailleur
c3036d455a FIX #20902 2022-06-01 15:56:44 +02:00
lmarcouiller
2a89e396fe Fix #20878 : improper use of dol_move 2022-06-01 15:17:19 +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
Laurent Destailleur
65913cdd15 Fix list of event empty. 2022-06-01 13:11:36 +02:00
stickler-ci
adb37a5f5f Fixing style errors. 2022-06-01 09:53:51 +00:00
lmarcouiller
d345957b84 Fix: import update on xlsx 2022-06-01 11:36:47 +02:00
Quentin VIAL-GOUTEYRON
682da1fabe FIX if password doesnt match rule it created a user without password 2022-06-01 11:33:15 +02:00
Laurent Destailleur
c8ff7ff02a Fix look and feel v16 2022-05-31 19:46:12 +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
98ebe0cff4 Trans 2022-05-31 17:58:47 +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
Laurent Destailleur
a7155676af Debug v16 2022-05-31 12:49:03 +02:00
Laurent Destailleur
2d0958ba7f Look and feel v16 2022-05-31 11:00:21 +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
Laurent Destailleur
70500745f5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-05-30 22:45:06 +02:00
Laurent Destailleur
396d1411e5 Fix default order 2022-05-30 19:13:03 +02:00
Gauthier PC portable 024
8b4054f8e9 FIX : missing phpcs:enable 2022-05-30 17:22:25 +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
3080605139
Merge pull request #21032 from FHenry/14.0_fix_extrafeilds_bad_display_inline
fix: extrafields chkbxlst or checkbox or badly displayed in line object
2022-05-29 11:20:07 +02:00
Laurent Destailleur
d29a75434b
Merge pull request #21041 from DATUC/patch-26
Local CM adjust
2022-05-29 11:16:15 +02:00
Laurent Destailleur
e975fb2bfb
Merge pull request #21039 from nealjoos/patch-2
fix: README broken links
2022-05-29 11:15:51 +02:00
Laurent Destailleur
6a9c07de9f
Update README.md 2022-05-29 11:15:38 +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
94424c7c2f
Merge pull request #21047 from aspangaro/15p2
Merge problem
2022-05-29 10:49:53 +02:00
Laurent Destailleur
319eac2c45 Fix trans 2022-05-29 10:46:00 +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
Alexandre SPANGARO
e315f2d503 Merge branch '15.0' of https://github.com/Dolibarr/dolibarr into 15.0 2022-05-29 03:37:18 +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
2c9c55bc75 Fix filter on dates 2022-05-28 16:52:39 +02:00
Laurent Destailleur
7ddf4ef315 Fix look and feel v16 2022-05-28 12:50:44 +02:00
Laurent Destailleur
59fcd9de13 Fix trans 2022-05-28 12:36:03 +02:00