Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
118,804 Commits 36 Branches 189 Tags
86971c7b863c1b891c30f901b5ed3751eeaa720d
Commit Graph

11637 Commits

Author SHA1 Message Date
Philippe GRAND
aca217a585 FIX php8 compatibility 2022-08-28 13:53:31 +02:00
Philippe GRAND
b43527de8f FIX php8 compatibility 2022-08-28 13:52:48 +02:00
Laurent Destailleur
4ba1a467fa Fix php8 2022-08-27 22:42:40 +02:00
fboitel
59df9f96ca Merge branch 'Dolibarr:develop' into smtp-oauth-patch 2022-08-27 17:09:04 +02:00
Laurent Destailleur
138e087737 Fix phpcs 2022-08-27 11:45:02 +02:00
Laurent Destailleur
b78e9e7e54 Merge pull request #21894 from atm-lena/16.0_AddForceCombo_SelecttDolUserFunction 
Add forcecombo parameter to select dol user function
 2022-08-26 19:12:22 +02:00
Laurent Destailleur
c0aa370915 Mark not stable dev as level 2. Need to kill only old running processes. 2022-08-26 19:10:49 +02:00
Laurent Destailleur
1f2c367ec3 Merge pull request #21840 from fcharlaix-opendsi/21780 
Work for #21780 Add cleanUnfinishedCronjob job
 2022-08-26 18:41:41 +02:00
Faustin
0188629cf6 Oauth ui for tickets and emailing 2022-08-26 15:21:35 +02:00
Regis Houssin
68994752cd FIX multiple php8 compatibility 2022-08-26 11:08:39 +02:00
atm-lena
2b4391019b Add forcecombo parameter to select dol user function 2022-08-26 08:55:11 +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
3736a54067 Fix scrutinizer bugs 2022-08-25 13:59:24 +02:00
Laurent Destailleur
33361e7948 Merge pull request #21852 from frederic34/useismodenabled 
use isModEnabled
 2022-08-24 18:12:02 +02:00
Laurent Destailleur
03d086f741 NEW Encrypt all sensitive constants in llx_const 2022-08-24 12:22:11 +02:00
atm-lena
6e5d395ac8 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-08-24 11:38:19 +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
Laurent Destailleur
b5d3f0df06 css 2022-08-23 02:08:55 +02:00
Florian Charlaix
c0d36979ee Work for #21780 Add cleanUnfinishedCronjob job 
Add cleanUnfinishedCronjob cronjob to clean unfinished job
Set job processing to 0, last result as an error with the reason in last output
 2022-08-22 17:34:47 +02:00
kevin
6da57e512b FIX PHP8 warning in ShowOutputField function 2022-08-22 16:04:40 +02:00
Laurent Destailleur
156479cda3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-22 15:18:55 +02:00
Laurent Destailleur
0f80a923ee Merge pull request #21673 from bb2a/setup-yesno 
Fix - Form Setup yesno
 2022-08-22 15:16:26 +02:00
Laurent Destailleur
f17f22755c Clean code using of oldcopy 2022-08-22 15:06:09 +02:00
Frédéric FRANCE
7f60a34799 use isModEnabled 2022-08-19 18:07:21 +02:00
kevin
9ad4c114de Merge branch '15.0' of https://github.com/Dolibarr/dolibarr into FIX_year_interval_select_date 2022-08-17 17:21:45 +02:00
kevin
ad3bfc745f Default value of +-100 for datepicker 2022-08-17 17:21:21 +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
0abfaf6bd7 Fix regression in online signature 2022-08-14 20:45:04 +02:00
Laurent Destailleur
61739cc338 FIX online signature, better error management. 2022-08-14 20:03:13 +02:00
Laurent Destailleur
6a61c495b3 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-08-14 19:22:58 +02:00
Laurent Destailleur
b3656c21bc Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-08-14 19:12:28 +02:00
Laurent Destailleur
4d682aef1f Merge pull request #21727 from fboitel/smtp-by-oauth-refresh-token 
smtp by oauth2: token now refresh before it expires
 2022-08-14 15:41:04 +02:00
Laurent Destailleur
24b1085639 Clean code. Prepare for inputing prices with taxes 2022-08-13 19:30:26 +02:00
Laurent Destailleur
baaa72c80d Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-13 12:05:16 +02:00
Laurent Destailleur
498ed449e9 Fix label of invoice status 2022-08-13 12:03:41 +02:00
Laurent Destailleur
326686794a Fix when log handler has been removed 2022-08-12 17:09:14 +02:00
Laurent Destailleur
533e4f2424 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/fr_FR/accountancy.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/members.lang
	htdocs/langs/fr_FR/products.lang
 2022-08-12 16:03:09 +02:00
Laurent Destailleur
059d0073ff FIX Maxi debug v16 2022-08-12 15:54:50 +02:00
Laurent Destailleur
3c65841e19 Debug v16 2022-08-12 14:41:44 +02:00
Laurent Destailleur
98b5247b27 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-08-12 12:20:23 +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
Faustin
6dd17ead60 expire was initiated as true instead of false 2022-08-12 11:42:23 +02:00
Faustin
0898a99314 Token now refresh before it expire 2022-08-12 11:00:02 +02:00
Laurent Destailleur
26b28419fb Merge pull request #21714 from frederic34/outh2forswiftmailer 
token was not refreshing
 2022-08-12 00:05:58 +02:00
Laurent Destailleur
c7aa3b81f2 Merge pull request #21721 from frederic34/patch-4 
doc
 2022-08-12 00:00:22 +02:00