Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
122,559 Commits 36 Branches 189 Tags
e65c85dc44f7ddbb9d2931be2d01eaed85b51a99
Commit Graph

2344 Commits

Author SHA1 Message Date
Laurent Destailleur
6e7aab7c81 Fix background of virtual card on dark mode 2023-06-09 11:26:28 +02:00
Laurent Destailleur
57d7fc6455 Debug v18 2023-06-08 22:43:15 +02:00
Laurent Destailleur
8d7e53a98c Clean code 2023-06-03 13:56:06 +02:00
Laurent Destailleur
476f95c4f6 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/comm/action/index.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
	htdocs/cron/class/cronjob.class.php
	htdocs/eventorganization/class/conferenceorbooth.class.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/public/ticket/list.php
	htdocs/supplier_proposal/list.php
	htdocs/ticket/class/ticket.class.php
 2023-05-17 00:57:17 +02:00
Laurent Destailleur
53c835419e Merge pull request #24713 from altairis-benjamin/fixPublicTicketTokens 
FIX token errors on public interface
 2023-05-16 20:51:07 +02:00
Laurent Destailleur
0ead047868 NEW Comment on survey is possible only after vote. 2023-05-16 11:24:42 +02:00
Laurent Destailleur
79cdb3a7f9 NEW Use an ajax component to swith prospection status on thidparty list 2023-05-15 16:35:42 +02:00
Laurent Destailleur
3992e12143 Fix responsiv 2023-05-13 17:43:27 +02:00
Laurent Destailleur
46b461b087 FIX Upload of files on public ticket interface 2023-05-13 16:39:42 +02:00
Laurent Destailleur
685995cf01 Debug v17 2023-05-12 13:06:36 +02:00
Laurent Destailleur
c6cb29381e Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-11 19:09:19 +02:00
Laurent Destailleur
f59987af77 Fix typo 2023-05-11 02:04:25 +02:00
Laurent Destailleur
a22a83827a Clean code 2023-05-11 01:46:36 +02:00
Laurent Destailleur
7d4312d574 Debug v17 2023-05-10 16:51:31 +02:00
Laurent Destailleur
fc4aeccf21 Fix opensurvey 2023-05-10 13:44:15 +02:00
Laurent Destailleur
c6423a4a55 Fix label 2023-05-10 11:28:17 +02:00
Laurent Destailleur
2d784f3008 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-10 05:01:15 +02:00
Laurent Destailleur
fae72ed74b Debug v17 2023-05-10 04:58:20 +02:00
Laurent Destailleur
c09b6783a7 Debug v17 2023-05-10 04:49:02 +02:00
Laurent Destailleur
3880871be7 Debug v17 2023-05-10 04:12:08 +02:00
Benjamin Falière
fbda1c87cd FIX token errors on public interface 2023-05-09 14:38:20 +02:00
Laurent Destailleur
a77b7ca395 Merge pull request #24674 from frederic34/instance_unique_id 
use $conf->file->instance_unique_id instead of $dolibarr_main_instance_unique_id
 2023-05-05 01:46:14 +02:00
Laurent Destailleur
c4ea0c7d35 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-04 21:43:37 +02:00
Laurent Destailleur
74ef3b076d FIX Count only attendee draft of validated. 2023-05-04 19:17:57 +02:00
Frédéric FRANCE
9d29ae8f10 wip 2023-05-03 14:22:30 +02:00
Laurent Destailleur
7a781840ca Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-03 04:54:49 +02:00
Laurent Destailleur
3c0e233145 NEW Can add an array of several links in date selector 2023-05-02 15:24:47 +02:00
Laurent Destailleur
889811c6d1 Fix amount on renewal for membership 2023-05-02 12:38:25 +02:00
Laurent Destailleur
e2ec34e1e5 Clean code 2023-05-01 14:33:08 +02:00
Laurent Destailleur
382f45ec14 Clean code 2023-04-30 03:36:02 +02:00
Laurent Destailleur
c891196b5b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-04-25 21:02:01 +02:00
Regis Houssin
9ed12a7b5a FIX avoid error when computed property of extrafields is used 2023-04-25 10:20:54 +02:00
Laurent Destailleur
86a0df9ce0 Autofill mor/phy when creating member from membership type card. 2023-04-24 15:35:33 +02:00
Laurent Destailleur
04bca1cc1f Fix when membership type option "Any amount" when Yes. 2023-04-24 14:51:20 +02:00
Laurent Destailleur
470cbb52f8 Fix phpunit 2023-04-23 14:09:08 +02:00
Laurent Destailleur
246750a89e Merge pull request #24545 from frederic34/use_ismodenabled 
use isModEnabled
 2023-04-21 18:32:34 +02:00
tnegre
53d2f8eaee pay whole contract 2023-04-21 16:06:09 +02:00
tnegre
5c5bb6ec7c Allow to pay a contract line from a stripe payment. TODO pay the whole contract. 2023-04-21 16:06:09 +02:00
Frédéric FRANCE
5f5fa38561 Merge remote-tracking branch 'upstream/develop' into use_ismodenabled 2023-04-21 15:16:08 +02:00
Laurent Destailleur
692eee1e25 FIX bad message oncallback of online payment 2023-04-20 13:14:50 +02:00
Laurent Destailleur
a39ceee426 Log 2023-04-20 13:01:24 +02:00
Laurent Destailleur
6dea0425cf No ambigous test 2023-04-20 12:21:55 +02:00
Laurent Destailleur
998b2b263e Fix public virtual card 2023-04-19 23:42:05 +02:00
Frédéric FRANCE
fee9dec15a use isModEnabled 2023-04-19 13:58:08 +02:00
Frédéric FRANCE
77441f2dd2 use isModEnabled 2023-04-18 23:39:02 +02:00
Frédéric FRANCE
fa849696fb use isModEnabled 2023-04-18 20:16:02 +02:00
Laurent Destailleur
96cb5fac9c Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-04-13 13:08:59 +02:00
Laurent Destailleur
fbe8e2731d Fix escapment 2023-04-13 12:58:06 +02:00
Laurent Destailleur
4fe73e1fc3 Fix duplicate defined 2023-04-13 10:41:27 +02:00
Laurent Destailleur
845f888caa Add note 2023-04-13 10:40:27 +02:00