Commit Graph

7824 Commits

Author SHA1 Message Date
Laurent Destailleur
a5c18ea776 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-31 17:57:14 +02:00
Philippe GRAND
6844d603ff update code 2022-08-29 09:23:15 +02:00
Laurent Destailleur
d0e08818e1
Merge pull request #21931 from grandoc/new_branch_27_08_2022
FIX php8 compatibility
2022-08-29 01:09:49 +02:00
ptibogxiv
5d5ea3efd8 FIx clean code signature proposal 2022-08-29 00:33:00 +02:00
ptibogxiv
0e2ade76ad
FIx clean code signature proposal 2022-08-28 23:36:18 +02:00
Philippe GRAND
5f1d6b406f FIX php8 compatibility 2022-08-28 13:47:36 +02:00
Philippe GRAND
3d64296992 FIX php8 compatibility 2022-08-28 13:43:50 +02:00
Philippe GRAND
5c6f9281c9 FIX php8 compatibility 2022-08-28 13:43:12 +02:00
Philippe GRAND
3bb1a2387b FIX php8 compatibility 2022-08-28 13:42:27 +02:00
Laurent Destailleur
09ad9e6e92 css 2022-08-27 22:14:56 +02:00
Laurent Destailleur
bfb01ae928 Clean code 2022-08-26 18:24:42 +02:00
Laurent Destailleur
af69270a0e NEW Can enter the unit price including the vat 2022-08-26 17:39:41 +02:00
Regis Houssin
68994752cd FIX multiple php8 compatibility 2022-08-26 11:08:39 +02:00
Laurent Destailleur
2e905b127a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/accountancy/index.php
	htdocs/product/admin/product.php
2022-08-25 14:35:08 +02:00
Laurent Destailleur
0d693d723a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/comm/propal/class/api_proposals.class.php
2022-08-25 14:31:47 +02:00
Laurent Destailleur
a4c0177db0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/user/bank.php
2022-08-25 14:29:09 +02:00
Laurent Destailleur
72a0725fec Fix phpcs 2022-08-25 13:52:30 +02:00
Frédéric France
e78f9a56be use isModEnabled 2022-08-23 20:16:28 +02:00
Frédéric France
86a7a7c8bb use isModEnabled 2022-08-23 20:05:09 +02:00
Frédéric France
582f6b196e use isModEnabled 2022-08-23 20:02:37 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
Christian Humpel
0bf814d558 Fix #21816: correct Agenda filter (if no filter is selected) 2022-08-20 18:00:43 +02:00
stickler-ci
c4e88b739f Fixing style errors. 2022-08-19 13:46:44 +00:00
atm-greg
ccbae64324 fix put line errase desc and label of line 2022-08-19 15:36:57 +02:00
Laurent Destailleur
d7209f1818 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-14 21:42:45 +02:00
Laurent Destailleur
ebc8823202 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/core/ajax/onlineSign.php
2022-08-14 21:41:25 +02:00
Laurent Destailleur
57fea5151d Fix regression in online signature
Conflicts:
	htdocs/core/ajax/onlineSign.php
	htdocs/public/onlinesign/newonlinesign.php
2022-08-14 20:50:28 +02:00
Laurent Destailleur
0abfaf6bd7 Fix regression in online signature 2022-08-14 20:45:04 +02:00
Laurent Destailleur
24b1085639 Clean code. Prepare for inputing prices with taxes 2022-08-13 19:30:26 +02:00
Laurent Destailleur
2d8b544ace Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
2022-08-12 12:19:20 +02:00
Laurent Destailleur
110f7a4736 Debug v16 2022-08-12 12:17:49 +02:00
Laurent Destailleur
9bc6c41ca7 Clean code: No more fetch to clone 2022-08-11 23:59:25 +02:00
Laurent Destailleur
8c903bf935 Clean deprecated code. Fix go back to mode1 in supplier invoice 2022-08-11 20:23:44 +02:00
Laurent Destailleur
4fb3a2e296 Fix scrutinizer 2022-08-11 00:52:08 +02:00
Laurent Destailleur
95b1b3f990 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/commande/card.php
	htdocs/emailcollector/class/emailcollector.class.php
	htdocs/index.php
	htdocs/website/index.php
2022-08-10 13:16:02 +02:00
Laurent Destailleur
f95b70eb9b
Merge pull request #21686 from hregis/fix_php8_compatibility
FIX php8 compatibility
2022-08-10 04:18:14 +02:00
Anthony Berton
0764a9c123 FIX - php V8 multiprice thirdpaty card 2022-08-09 16:45:04 +02:00
Regis Houssin
b20144c3d0 FIX php8 compatibility 2022-08-08 11:39:43 +02:00
Laurent Destailleur
528d54ba79 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-02 20:28:07 +02:00
Laurent Destailleur
ed907fa972
Merge pull request #21599 from bb2a/FIX---php-V8-user-right-in-propal-card-and-use-$user->hasRight
FIX - php V8 user right in propal card and use $user->hasRight
2022-08-02 19:43:58 +02:00
Laurent Destailleur
ab2afd772b
Merge pull request #21600 from ymollard/eventorg-fixes
FIX: EventOrganization Missing databases entries and labels
2022-07-29 15:40:21 +02:00
Laurent Destailleur
2cbb71f523
Merge pull request #21604 from bb2a/FIX---php-V8-user-right-actioncomm-class
FIX - php V8 user right actioncomm class
2022-07-28 19:01:56 +02:00
Laurent Destailleur
b6a6dd91d8 # WARNING: head commit changed in the meantime
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-07-28 18:52:44 +02:00
Laurent Destailleur
5c3139974c css 2022-07-28 14:55:47 +02:00
Anthony Berton
9c0cf32ef7 FIX - php V8 user right actioncomm class 2022-07-28 11:56:07 +02:00
Laurent Destailleur
6ce2b02207 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-28 02:39:27 +02:00
Laurent Destailleur
f6d54ca101 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	ChangeLog
	build/exe/doliwamp/doliwamp.iss
	htdocs/comm/action/index.php
	htdocs/comm/action/peruser.php
2022-07-28 02:36:57 +02:00
Yoan Mollard
244f3913b0 Qualify cactionevents for eventorganization 2022-07-27 21:35:52 +02:00
Anthony Berton
31d4d0dcd4 FIX - php V8 user right in propal card and use $user->hasRight 2022-07-27 18:09:11 +02:00
Laurent Destailleur
78ee02408e
Merge pull request #21431 from fboitel/NEW-recursive-envents
NEW : Recurrent events on agenda v1
2022-07-27 11:01:26 +02:00