Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 11:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
113,852 Commits 36 Branches 190 Tags
8e61f77f4df34b6789c2f3f0c2f5f9f0af7f901b
Commit Graph

324 Commits

Author SHA1 Message Date
Laurent Destailleur
7a277d9560 Merge branch 'develop' into loaddolibarrenv 2022-09-09 17:02:05 +02:00
Philippe GRAND
b411ec8b59 update code toward php8 compliance 2022-09-09 10:26:01 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
Yoan Mollard
a4be13595e Fix: missing caneditamount choice during edition 2022-08-26 21:50:00 +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
ptibogxiv
7d29a5df79 Fix type with multicompany 2022-08-02 19:46:09 +02:00
ptibogxiv
1165b32c70 Fix type with multicompany 2022-08-02 19:07:39 +02:00
Laurent Destailleur
6f1d62d8a5 Fix trans 2022-07-11 17:06:03 +02:00
Laurent Destailleur
48a710dffa Update type.php 2022-07-11 11:37:58 +02:00
Yoan Mollard
5998999f18 NEW: Add free membership amounts at the membership type level 2022-06-28 02:33:17 +02:00
Laurent Destailleur
9386a0503e Fix update note 2022-04-11 02:09:24 +02:00
Laurent Destailleur
40720fad25 Fix php8 compatibility 2022-04-11 02:01:32 +02:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
3fc0205d0b Fix responsive 2021-12-25 12:44:46 +01:00
Laurent Destailleur
69cd7ae2ab Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/don/card.php
	htdocs/public/test/badges.php
	htdocs/public/test/test_exec.php
 2021-12-08 18:27:03 +01:00
Laurent Destailleur
c3bfd5caa4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/adherents/type.php
	htdocs/asset/type.php
	htdocs/categories/edit.php
	htdocs/comm/action/card.php
	htdocs/compta/bank/card.php
	htdocs/contact/card.php
	htdocs/contact/list.php
	htdocs/core/class/extrafields.class.php
	htdocs/don/card.php
	htdocs/product/stock/card.php
	htdocs/projet/card.php
	htdocs/projet/tasks/task.php
	htdocs/user/group/card.php
 2021-12-08 18:21:20 +01:00
Laurent Destailleur
f1dac82a53 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/adherents/card.php
	htdocs/categories/edit.php
	htdocs/contact/card.php
	htdocs/core/class/extrafields.class.php
	htdocs/product/stock/card.php
 2021-12-08 17:56:05 +01:00
Quentin VIAL-GOUTEYRON
826bde0656 FIX set optional from post 2021-12-06 11:19:12 +01:00
Laurent Destailleur
673a2982a5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/card.php
 2021-09-30 16:32:40 +02:00
Laurent Destailleur
52fb627a64 Look and feel v14 2021-09-29 16:45:48 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
d2d7b0defd Fix duplicate ; 2021-08-31 20:15:41 +02:00
Christian Foellmann
227f61a711 replace remaining SubmitCancel buttons 2021-08-24 16:10:20 +02:00
Christian Foellmann
d706c3b1ec use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination 2021-08-20 14:41:30 +02:00
Laurent Destailleur
cbdf121215 Merge branch 'develop' into dev_2 2021-08-17 19:20:42 +02:00
ptibogxiv
a181469ff8 Update type.php 2021-07-26 14:34:45 +02:00
ptibogxiv
cfdcad0077 Update type.php 2021-07-26 14:30:38 +02:00
Givriz
3df4cd8857 Compatibility phpv8 2021-07-20 20:28:04 +02:00
Laurent Destailleur
19a203bd40 Fix amount of memberships 2021-05-12 22:09:06 +02:00
daraelmin
6644fd3a73 Fix undefined translation key 2021-05-03 22:15:40 +02:00
Laurent Destailleur
9973085613 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/comm/propal/card.php
	htdocs/compta/bank/releve.php
	htdocs/compta/paiement/rapport.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/reception/card.php
	htdocs/societe/societecontact.php
 2021-05-03 19:36:49 +02:00
Laurent Destailleur
cbc481dc60 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/adherents/list.php
	htdocs/adherents/type.php
	htdocs/core/lib/company.lib.php
 2021-05-03 19:01:47 +02:00
Laurent Destailleur
540e4f3d2e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-03 18:58:41 +02:00
stickler-ci
832ceb2be3 Fixing style errors. 2021-05-01 18:36:59 +00:00
daraelmin
5f23c68f85 Update type.php 2021-05-01 20:01:18 +02:00
Laurent Destailleur
0d4eaca3e8 Merge pull request #17426 from daraelmin/daraelmin-patch-v11 
Fix wrong alias in natural_search v11-v14
 2021-04-30 11:58:53 +02:00
daraelmin
4174ebd9c0 Fix subscription =="yes" 2021-04-29 23:11:51 +02:00
daraelmin
68415322ec Fix v11 wrong alias in natural_search 2021-04-29 10:00:54 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00
daraelmin
4d8ed4bd40 merge develop 2021-03-20 15:34:30 +01:00
Frédéric FRANCE
19079dcae6 fix php8 warning 2021-03-19 17:17:08 +01:00
daraelmin
e290884552 update subscription and type 2021-03-18 23:23:57 +01:00
UT from dolibit
972d162c5e Update type.php 
$help_url = 'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder';
 2021-03-18 21:16:44 +01:00
daraelmin
fa25ba797f Add excluded status in adherent type stats 2021-03-13 15:28:31 +01:00
Frédéric FRANCE
1b046f25cf add new rule 2021-03-01 00:19:52 +01:00
Laurent Destailleur
d16276ea2c Clean code 2021-02-16 11:15:42 +01:00
Laurent Destailleur
e7775d2f79 Fix scrutinizer errors 2020-11-30 12:54:47 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel" 
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
 2020-11-23 15:12:52 +01:00