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

12488 Commits

Author SHA1 Message Date
Laurent Destailleur
da03175c07 Merge branch 'develop' into dev_19763 2022-07-07 23:06:22 +02:00
Laurent Destailleur
67d17cf289 Trans 2022-07-07 22:50:42 +02:00
Laurent Destailleur
f59cbc09a2 Merge pull request #21156 from atm-jpb/NEW/Collective_group_leave 
New/collective group leave request
 2022-07-07 22:44:13 +02:00
Laurent Destailleur
4086f3f36c Merge pull request #21317 from ymollard/project-reports 
Filter accounting reports by projects
 2022-07-07 21:20:52 +02:00
Christian Foellmann
4c5e05e411 fix page titles 
Conflicts:
	htdocs/compta/bank/annuel.php
	htdocs/contact/list.php
	htdocs/product/stock/movement_list.php
	htdocs/user/list.php
 2022-07-06 19:19:08 +02:00
Laurent Destailleur
6365bdb35c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-06 19:10:45 +02:00
atm-lena
503e2310ea WIP 2022-07-06 16:51:50 +02:00
Laurent Destailleur
76e3c10c06 Revert "fix page titles" 2022-07-06 15:56:04 +02:00
Laurent Destailleur
a0caf7be71 Merge pull request #21394 from cfoellmann/PR/improve-page-titles 
fix page titles
 2022-07-06 15:55:10 +02:00
Laurent Destailleur
9a10e3f971 Merge branch 'develop' into NEW#21395 2022-07-06 15:53:22 +02:00
Laurent Destailleur
745f504a27 Clean init process 2022-07-06 15:47:14 +02:00
atm-lena
55f0dada34 WIP 2022-07-06 13:55:43 +02:00
lvessiller
ed9c7ff251 FIX resolve conflicts 2022-07-06 09:23:44 +02:00
bagtaib
377e079a6e backend 2022-07-06 07:56:42 +02:00
atm-lena
4e1dc2792c Add default workstation in service card 2022-07-05 13:58:35 +02:00
Laurent Destailleur
1c2727e2a7 Merge pull request #21354 from badre-agtaib/new2 
FIX #21204
 2022-07-04 15:30:33 +02:00
Laurent Destailleur
3c91a3a56b Clean not used files 2022-07-03 11:47:40 +02:00
Alexandre SPANGARO
32a9e53382 Merge remote-tracking branch 'upstream/develop' into 17p1 2022-07-03 07:29:41 +02:00
Faustin
259224c3be NEW : Recurrent events on agenda v1 2022-07-02 18:48:35 +02:00
Yoan Mollard
1e6df0c6d9 Merge remote-tracking branch 'origin/develop' into membership-rework 2022-07-01 17:38:47 +02:00
Laurent Destailleur
6e153b9b75 Debug import FIX #yogosha11618 2022-06-30 22:55:58 +02:00
Gauthier PC portable 024
bf98c77d73 FIX : french traductions for payment methods 2022-06-30 10:24:47 +02:00
Laurent Destailleur
07aebba254 Debug v16 2022-06-30 01:55:56 +02:00
Laurent Destailleur
a98599084d Debug v16 2022-06-30 01:34:58 +02:00
Yoan Mollard
3dcf7db198 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into membership-rework 2022-06-29 16:12:05 +02:00
Yoan Mollard
e7058c253e NEW: Table of membership types 2022-06-29 03:25:33 +02:00
Yoan Mollard
f8af181cee Label clarification following the new per-type setting "CanEditAmount" 2022-06-29 00:28:33 +02:00
Yoan Mollard
759900bcce No longer allow to edit amount in the payment step 
If amount is editable, edition has been done in the previous screen in
public/members/new.php
It also allows the possibility to prevent the visitor from doing a >0
payment if this is not wanted.
 2022-06-29 00:27:18 +02:00
Laurent Destailleur
67ade177c7 Fix error message 2022-06-28 20:11:18 +02:00
Laurent Destailleur
0091c31b99 Debug v16 2022-06-28 11:07:06 +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
f2a9db5fe3 Typo 2022-06-27 22:45:09 +02:00
Laurent Destailleur
0e0c9888a2 Typo 2022-06-27 22:43:29 +02:00
Laurent Destailleur
34464ac92b Maxi debug of OAuth module. Solve tons of problems. 2022-06-27 22:35:58 +02:00
Faustin
3e66ca1636 NEW #21395 : Added picto text to inform that option does not work with all themes 2022-06-27 16:18:54 +02:00
Faustin
d7d02fee9a NEW #21395 : Added option for dark theme mode in display - color and theme 2022-06-27 16:08:06 +02:00
Christian Foellmann
89d1389e2d fix page titles 2022-06-27 12:48:04 +02:00
Yoan Mollard
10aa31a376 Let users know that the PDF invoice is enclosed 2022-06-27 00:31:59 +02:00
Yoan Mollard
6053f3e5f8 Internationalize invoice lines for new memberships 2022-06-27 00:27:00 +02:00
Yoan Mollard
3d00c065ae Missing label for excluded members 2022-06-26 23:51:10 +02:00
lvessiller
7b7ecf44ad Merge branch 'develop' of github.com:Dolibarr/dolibarr into new-inventory-category-field 2022-06-24 17:30:14 +02:00
jpb
ac53c0c454 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/Collective_group_leave 2022-06-24 11:42:37 +02:00
bagtaib
cc0be635dc removed the new option and enhanced the old one 2022-06-23 15:37:37 +02:00
Laurent Destailleur
49e4a070dc Work on #21136 2022-06-23 14:14:25 +02:00
Laurent Destailleur
ff4911384e Debug new import tool 2022-06-22 21:52:00 +02:00
bagtaib
03de870751 NEW #21204 2022-06-22 16:29:15 +02:00
Laurent Destailleur
e698d20789 Merge branch 'develop' into develop#6 2022-06-22 12:09:58 +02:00
atm-GregM
e8a5d4f008 Merge branch 'develop' into NEW_exped_ObjectLink 2022-06-21 15:31:45 +02:00
GregM
8c0b1efce4 NEW add objectLink expedition 2022-06-21 15:21:45 +02:00
Laurent Destailleur
26abe22f23 Trans 2022-06-20 17:17:33 +02:00