Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-18 15:31:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
115,119 Commits 36 Branches 190 Tags
cb15e1ea8a5414d03ce18f3145d9db358eb2d909
Commit Graph

29193 Commits

Author SHA1 Message Date
Laurent Destailleur
e9b3d436ca css 2022-07-10 19:47:36 +02:00
Laurent Destailleur
bd3af19978 Merge pull request #21335 from atm-GregM/NEW_exped_ObjectLink 
NEW add objectLink on expedition
 2022-07-10 19:33:49 +02:00
Laurent Destailleur
9a92c7d9b0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/extrafields.class.php
 2022-07-10 19:28:16 +02:00
Laurent Destailleur
88543c85ba Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-07-10 19:22:15 +02:00
Laurent Destailleur
3d226801ba Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-07-10 19:22:02 +02:00
Laurent Destailleur
840d9b182b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-07-10 19:19:08 +02:00
Laurent Destailleur
52661e09c7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/modules/modResource.class.php
 2022-07-10 19:18:59 +02:00
Laurent Destailleur
16d04e475b Merge branch 'develop' into membership-rework 2022-07-10 18:58:49 +02:00
Laurent Destailleur
c16cd502d0 Update actions_massactions.inc.php 2022-07-10 18:43:25 +02:00
Laurent Destailleur
3fbaea6a93 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-07-10 18:25:22 +02:00
Laurent Destailleur
09932000dd FIX online signature works partially on ODT templates. 2022-07-10 18:06:41 +02:00
Francis Appels
6362cdfe2e FIX regression by php8 fix on setVarsFromFetchObj 2022-07-10 13:00:34 +02:00
Laurent Destailleur
ca3cf1de9f NEW Add " as enclusore by default for CSV export. Keep removing CR/LF. 
Fix export of invoice.
 2022-07-10 02:25:46 +02:00
Laurent Destailleur
c77632ced8 Fix export invoice and lines. Pb in field order. Missing thirdparty type 2022-07-10 01:40:39 +02:00
Laurent Destailleur
25857c4cf2 FIX css on title of extrafield dates 2022-07-09 14:49:35 +02:00
Laurent Destailleur
77e0ca72fe Prepare edition of css for extrafields 2022-07-09 14:39:20 +02:00
Laurent Destailleur
697b7d812c FIX css in search of extrafields 2022-07-09 12:57:52 +02:00
Laurent Destailleur
4fdcb43d9c NEW Add extrafield type "IP" to store IP addresses 2022-07-09 12:56:38 +02:00
Laurent Destailleur
71838216f5 FIX css in search of extrafields 2022-07-09 12:56:08 +02:00
Florian HENRY
56c4817d6d fix: Bad amount calc on Invoice index 2022-07-08 17:30:15 +02:00
Thomas Negre
8f505fbd67 formconfirm: redraw the page with the data returned from POST request. This displays errors, if there are. 2022-07-08 16:31:15 +02:00
Laurent Destailleur
bdfa0536a6 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-08 14:20:44 +02:00
Laurent Destailleur
245580bfa5 FIX Several pb in invoice remind (html detection, no event, transaction) 2022-07-08 14:11:13 +02:00
jpb
226488b7ed rank change. if we only have one order we leave the origin rank otherwhise we pass -1 2022-07-08 12:32:17 +02:00
Laurent Destailleur
61f1595f8c Fix look and feel v15 2022-07-08 11:21:54 +02:00
Gauthier PC portable 024
d375c9fbbe FIX : backport commit 5b3fcc5e43, chkbxlst cannot be emptied 2022-07-08 10:35:43 +02:00
Laurent Destailleur
5e54639749 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-08 10:23:47 +02:00
Laurent Destailleur
3ab82a93ec Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2022-07-08 10:20:55 +02:00
Yoan Mollard
07b5657ba1 Merge remote-tracking branch 'origin/develop' into HEAD 2022-07-08 10:11:22 +02:00
Laurent Destailleur
7741826d34 phpcs 2022-07-07 23:09:39 +02:00
Laurent Destailleur
7f7b5fa92e Merge pull request #20429 from Hystepik/develop#4 
Fix : filemanagement in ecm and medias
 2022-07-07 23:04:32 +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
33a65dd9b8 Merge pull request #21246 from Easya-Solutions/new-inventory-list-show-product-ref-with-label 
NEW show product label on inventory
 2022-07-07 22:08:06 +02:00
Laurent Destailleur
66889ea450 Merge pull request #21297 from Easya-Solutions/new-thirdparty-card-presend-with-attached-file 
NEW add attached file in presend email form of thirdparty card
 2022-07-07 21:54:10 +02:00
Laurent Destailleur
a871aa8f85 Merge pull request #21382 from fboitel/NEW#20650 
NEW #20650 Checkbox column on left for lists
 2022-07-07 21:48:51 +02:00
Laurent Destailleur
63ce535deb Merge pull request #21448 from atm-jpb/patch-1 
# FIX : rank duplicate on mass action
 2022-07-07 20:57:51 +02:00
Laurent Destailleur
5afe1dbb84 Update actions_massactions.inc.php 2022-07-07 20:57:29 +02:00
Laurent Destailleur
47924e5c21 Merge pull request #21465 from jyhere/jyhere-patch-1 
ADD multiselect support in Form::formconfirm()
 2022-07-07 20:49:04 +02:00
Laurent Destailleur
116633ed2f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-07 20:14:47 +02:00
Laurent Destailleur
2f269c75de Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/fr_FR/bills.lang
 2022-07-07 20:12:23 +02:00
Thomas Negre
11e97df558 forgot a 'page' parameter for 'no' button 2022-07-07 17:39:17 +02:00
Thomas Negre
c6bc767834 send formconfirm as a POST 2022-07-07 17:21:03 +02:00
jyhere
fc6eb42ae7 Missing space 2022-07-07 11:52:44 +02:00
Laurent Destailleur
f2a6560d8f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-07 11:45:36 +02:00
jyhere
440ed897ff ADD multiselect support in Form::formconfirm() 
Use 'multiselect' type to add a multi select field in form confirm questions.
 2022-07-07 11:32:42 +02:00
jpb
ea52403339 rank change. if we only have one order we leave the origin rank otherwise we leave the -1 and let the class set the max rank. 2022-07-07 11:08:01 +02:00
jpb
f10788e4c6 fix export resource type filter 2022-07-07 10:24:39 +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
Laurent Destailleur
76e3c10c06 Revert "fix page titles" 2022-07-06 15:56:04 +02:00