Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-29 12:13:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
145,227 Commits 38 Branches 191 Tags
0de4e225fb702681d7e9d19ecda1c1da170a357e
Commit Graph

9579 Commits

Author SHA1 Message Date
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
Anthony Berton
5a4d5d7f97 set_echeance no in set_date 2022-08-23 08:56:00 +02:00
Anthony Berton
8328923e09 update date 2022-08-22 17:18:31 +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
lvessiller
74a2b58e85 FIX resolve conflicts 2022-08-12 14:55:06 +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
lvessiller
a3b240bd3b FIX resolve conflicts 2022-08-05 11:23:02 +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
lvessiller
62b70b37d3 NEW set today start time at begining 2022-07-27 08:32:46 +02:00
lvessiller
bae3583fe3 FIX resolve conflicts 2022-07-26 16:49:35 +02:00
lvessiller
4d59fd2679 FIX reset today event time 2022-07-26 16:36:28 +02:00
Laurent Destailleur
5903a9f87f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-07-26 12:24:24 +02:00
Laurent Destailleur
aaee8ff0ca Debug v16 2022-07-25 18:03:07 +02:00
Florian HENRY
266b0213a5 fix: filter Status Not applicable into is not correctly manage on Agenda list 2022-07-25 13:18:03 +02:00
Laurent Destailleur
ab81492fa4 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formwebsite.class.php
	htdocs/core/lib/cron.lib.php
 2022-07-24 22:17:25 +02:00
Laurent Destailleur
25d01b2be5 Merge pull request #21502 from Easya-Solutions/new-comm-action-card-hook-formconfirm 
NEW hook formConfirm on action comm card
 2022-07-24 20:23:40 +02:00
Laurent Destailleur
dd29018987 Fix bad table name 2022-07-24 18:27:15 +02:00
lmarcouiller
bac8efd4c8 Fix : PHP 8.1 warnings 2022-07-22 17:32:18 +02:00
lvessiller
993812dc70 FIX stickler-ci 2022-07-21 11:22:53 +02:00