lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

97174 Commits

Author SHA1 Message Date
Frédéric FRANCE
5b316487b4
Update eldy.lib.php 2022-06-02 10:29:34 +02:00
Frédéric FRANCE
96bf5a9c8a
New isModEnabled function 2022-06-02 10:21:05 +02:00
stickler-ci
858926d95e Fixing style errors. 2022-06-02 08:15:04 +00:00
jyhere
bd1d6de326
FIX : array merges in expedition class 2022-06-02 10:11:53 +02:00
jyhere
f582814c0f
Update bom.class.php 2022-06-02 09:46:26 +02:00
Alexandre SPANGARO
7b55676b56 Merge branch '14.0' into 14a35 2022-06-01 23:12:02 +02:00
Alexandre SPANGARO
1dcd4d0ab6 Typo in CSS class 2022-06-01 23:11:20 +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
f5705e89a8
Merge branch 'develop' into patch-195 2022-06-01 22:03:19 +02:00
Laurent Destailleur
53e7f2dc7e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-01 22:02:16 +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
49ded63cbc
Merge pull request #21052 from defrance/patch-197 
php V8 warning
 2022-06-01 21:57:21 +02:00
Laurent Destailleur
93499d611c
Update index.php 2022-06-01 21:57:03 +02:00
Laurent Destailleur
6cab758841 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/knowledgemanagement/knowledgerecord_list.php
	htdocs/theme/md/style.css.php
 2022-06-01 21:55:36 +02:00
Laurent Destailleur
76da86112c Doc 2022-06-01 21:46:42 +02:00
Laurent Destailleur
169ebdef10 FIX #21051 2022-06-01 21:46:07 +02:00
ptibogxiv
b5197a07c1 Fix API knowledgemanagement 2022-06-01 21:42:18 +02:00
Laurent Destailleur
967304d704
Merge pull request #21051 from ptibogxiv/patch-11 
Fix API knowledgemanagement
 2022-06-01 21:36:24 +02:00
Laurent Destailleur
62ee0ff29c
Merge pull request #21054 from frederic34/patch-1 
force refresh css
 2022-06-01 21:34:23 +02:00
Laurent Destailleur
9efc1e2d36
Merge pull request #21064 from milenmk/develop 
Fix issue #21063
 2022-06-01 21:33:19 +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
f5683c0647
Merge pull request #21061 from andreubisquerra/develop 
Avoid automatic printing in TakePOS history
 2022-06-01 21:28:03 +02:00
Laurent Destailleur
8f33d91783
Merge pull request #21073 from fappels/15_fix_update_buyprice_packaging 
FIX: sql error when PRODUCT_USE_SUPPLIER_PACKAGING enabled.
 2022-06-01 21:01:19 +02:00
Laurent Destailleur
31c94dde3b
Merge pull request #21066 from Hystepik/develop#1 
fix php8.0 warnings
 2022-06-01 21:00:55 +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
3751fc92ca Clean code 2022-06-01 20:47:14 +02:00
Laurent Destailleur
b8e1a14877 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-01 20:16:56 +02:00
Laurent Destailleur
bbc9175eb1
Merge pull request #21075 from NextGestion/dolibarr_fixbugs 
PHP V8 warning societe/index.php
 2022-06-01 20:16:29 +02:00
Laurent Destailleur
2cc4dd30fc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-01 20:08:45 +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
4dc7135d5d
Merge pull request #21083 from manu8170/develop 
Fix a few CSS errors in md theme
 2022-06-01 19:56:23 +02:00
Laurent Destailleur
c55c150937
Merge pull request #21082 from manu8170/15.0 
Fix a few CSS errors
 2022-06-01 19:56:03 +02:00
Laurent Destailleur
a035449cc5 Debug v16 2022-06-01 19:53:13 +02:00
Laurent Destailleur
704266445c Debug v16 2022-06-01 19:45:46 +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
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
edc8bebf10
Merge pull request #21090 from Hystepik/develop_v15#1 
Fix #21037 : select extrafield in knowledgerecord_list
 2022-06-01 19:33:20 +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
lmarcouiller
67ac6b41f0 Fix #21037 : select extrafield in knowledgerecord_list 2022-06-01 15:07:14 +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
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
Quentin VIAL-GOUTEYRON
682da1fabe FIX if password doesnt match rule it created a user without password 2022-06-01 11:33:15 +02:00
BENKE Charlene
0126f043c9
fixed 2022-06-01 10:53:52 +02:00
Nicolas
4696cd33d5 fix for issue #16985 2022-06-01 10:42:29 +02:00
Manu
06def03a1f Fix a few CSS errors in md theme 2022-06-01 09:36:57 +02:00
Manu
008396b3df Fix a few CSS errors 2022-06-01 09:18:54 +02:00
BB2A Anthony Berton
976f6d42b8 php V8 warning 2022-06-01 09:15:21 +02:00
Laurent Destailleur
c8ff7ff02a Fix look and feel v16 2022-05-31 19:46:12 +02:00
NextGestion
3976087c78
Merge branch 'Dolibarr:develop' into dolibarr_fixbugs 2022-05-31 16:32:44 +00:00
NextGestion
b479cc4e9d PHP V8 warning societe/index.php 2022-05-31 17:31:11 +00: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
NextGestion
4e939a7c5d Fix error in "Subscription" list (toselect value) 2022-05-31 15:38:23 +00:00
Francis Appels
74346c6480 Fix sql error when PRODUCT_USE_SUPPLIER_PACKAGING enabled. 2022-05-31 16:59:57 +02:00
NextGestion
02d760cd5f
Merge branch 'Dolibarr:develop' into dolibarr_fixbugs 2022-05-31 14:30:50 +00: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
Laurent Destailleur
a7155676af Debug v16 2022-05-31 12:49:03 +02:00
BB2A Anthony Berton
d7eebeb913 php V8 warning class commonobject 2022-05-31 11:41:38 +02:00
lmarcouiller
2d13b47441 fix php8.0 warnings 2022-05-31 11:36:54 +02:00
BB2A Anthony Berton
e303f27a19 FIX PHP8 2022-05-31 11:36:23 +02:00
Milen Karaganski
93a53c4aea Fix issue #21063 2022-05-31 12:20:41 +03: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
andreubisquerra
0489e51cc0
Avoid AutoPrint in TakePOS history 2022-05-31 08:39:48 +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
NextGestion
5f40dee89a Fix error SQL in "import_insert" function 2022-05-30 15:26:22 +00:00
Gauthier PC portable 024
8b4054f8e9 FIX : missing phpcs:enable 2022-05-30 17:22:25 +02:00
Frédéric FRANCE
489aa22e56
force refresh css 2022-05-30 14:14:18 +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
stickler-ci
e8bc813a43 Fixing style errors. 2022-05-30 06:36:37 +00:00
BENKE Charlene
2b76e67d42
php V8 warning 2022-05-30 08:31:38 +02:00
BENKE Charlene
7dc93b3544
php v8 warning 2022-05-30 08:23:35 +02:00
BENKE Charlene
b8de54aac0
php V8 warning 2022-05-30 08:08:28 +02:00
BENKE Charlene
008800cf52
correct it 2022-05-30 07:46:21 +02:00