Commit Graph

109575 Commits

Author SHA1 Message Date
Laurent Destailleur
cbead0fa5a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/class/productbatch.class.php
2022-06-02 19:39:42 +02:00
Laurent Destailleur
f9f902f7f4 # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-06-02 19:37:47 +02:00
Laurent Destailleur
867168fcf4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-06-02 19:35:58 +02:00
Laurent Destailleur
10aa1a66bc Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-06-02 19:35:17 +02:00
Laurent Destailleur
12f3c016d3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-06-02 19:35:03 +02:00
Laurent Destailleur
4e033ba576 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-06-02 19:34:32 +02:00
Laurent Destailleur
ed5b8df385 FIX Bank account not set when creating invoice from order 2022-06-02 19:34:16 +02:00
Laurent Destailleur
c1637d9807 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-06-02 19:30:17 +02:00
Laurent Destailleur
10c101077b Fix auto check 2022-06-02 19:28:18 +02:00
Laurent Destailleur
6115461b30
Merge pull request #21102 from jyhere/patch-3
FIX errors in getLinesArray()
2022-06-02 14:50:40 +02:00
Laurent Destailleur
2fb5cdbb78
Merge pull request #21099 from aspangaro/14a35
Typo in CSS class
2022-06-02 14:46:16 +02:00
Laurent Destailleur
1fc29d6d40 Missing token 2022-06-02 14:26:57 +02:00
Laurent Destailleur
cb5f2333b2 Fix default sort order 2022-06-02 13:02:06 +02:00
Laurent Destailleur
b9a05ded29 Typo 2022-06-02 12:48:05 +02:00
Laurent Destailleur
603201206a css 2022-06-02 12:35:38 +02:00
Laurent Destailleur
bc79f041dc Debug v16 2022-06-02 11:11:28 +02:00
Laurent Destailleur
9f59eaa752 Debug v16 2022-06-02 10:39:04 +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
2f779dac8f
Merge pull request #21053 from defrance/patch-198
php V8 warning
2022-06-01 22:05:13 +02:00
Laurent Destailleur
ff450e57fd
Merge branch 'develop' into patch-198 2022-06-01 22:05:03 +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