Commit Graph

112767 Commits

Author SHA1 Message Date
Laurent Destailleur
4695bbbd60 Trans 2021-06-05 12:59:19 +02:00
Laurent Destailleur
be97d66f5b Look and feel v14 2021-06-05 12:58:14 +02:00
Laurent Destailleur
ddbfb5d734 Fix translation of note of product 2021-06-05 11:14:06 +02:00
Laurent Destailleur
7a93365836 Fix bad name of var 2021-06-05 11:07:38 +02:00
Frédéric FRANCE
69d70d5ea8
update connector version add trigger contact 2021-06-05 10:09:44 +02:00
Frédéric FRANCE
e79be6f487
add trigger contact 2021-06-05 09:41:14 +02:00
Frédéric FRANCE
1d1c85ca98
add trigger contact 2021-06-05 09:38:33 +02:00
Frédéric FRANCE
f6bc1c6414
add trigger contact 2021-06-05 09:37:38 +02:00
Alexandre SPANGARO
a92bd31ce1 Fix search_datexxx 2021-06-05 07:39:15 +02:00
Alexandre SPANGARO
6922359114 Merge remote-tracking branch 'upstream/develop' into 14b10 2021-06-05 07:22:38 +02:00
Alexandre SPANGARO
d2257c9986 Merge branch '14b11' of https://github.com/aspangaro/dolibarr into 14b11 2021-06-05 07:21:01 +02:00
Alexandre SPANGARO
7608ac2ded Merge remote-tracking branch 'upstream/develop' into 14b11 2021-06-05 07:20:31 +02:00
Alexandre SPANGARO
fb4cccde68
Merge branch 'develop' into 14b11 2021-06-05 07:17:54 +02:00
Alexandre SPANGARO
466bc26256 Fix with search_date_startxxx 2021-06-05 07:16:43 +02:00
Laurent Destailleur
865bf3b849 CSS 2021-06-05 02:42:49 +02:00
Laurent Destailleur
b6ba1de3b3 Fix remove use of captcha on backoffice for ticket creation 2021-06-05 02:18:45 +02:00
Laurent Destailleur
b77f2be2e1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-05 02:14:16 +02:00
Laurent Destailleur
703001c625
Merge pull request #17532 from ibuiv/ibuiv-status-suppliers-hooks
New Hooks to rename Supplier Orders statuses
2021-06-05 02:11:29 +02:00
Laurent Destailleur
39adaec7eb Fix var not found 2021-06-05 01:29:24 +02:00
Laurent Destailleur
3e53ab5bfe Fix scrutinizer 2021-06-05 01:17:16 +02:00
Laurent Destailleur
5d063ab880 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-05 01:11:16 +02:00
Laurent Destailleur
f0118183c8 Clean code 2021-06-05 01:11:05 +02:00
Laurent Destailleur
6ae4a75ac2
Update fournisseur.commande.class.php 2021-06-05 01:04:09 +02:00
Laurent Destailleur
2c04f2c018
Merge pull request #17821 from daraelmin/patch-2
Fix #17743 - token was hashed with membersubscription
2021-06-05 00:57:12 +02:00
Laurent Destailleur
246cb09ba5
Update newpayment.php 2021-06-05 00:56:28 +02:00
Laurent Destailleur
420bf440ef
Update newpayment.php 2021-06-05 00:53:07 +02:00
Laurent Destailleur
91d2e30cc3
Merge pull request #17820 from frederic34/zapier_create_thirdparty
test zapier
2021-06-05 00:47:53 +02:00
Laurent Destailleur
d327de4e80 Doc 2021-06-04 23:39:52 +02:00
daraelmin
c94946b934
Fix #17743 - token was hashed with membersubscription
#Fix #17743 - token was hashed with membersubscription

for retro-compatibility we must try to hash token wth both "membre" ans "membersubscription" to verify unique secure key d'or member
2021-06-04 23:14:31 +02:00
Frédéric FRANCE
3440024efe
test zapier 2021-06-04 22:35:05 +02:00
Frédéric FRANCE
3fb1fb63b4
test zapier 2021-06-04 22:16:25 +02:00
TuxGasy
56bb2bbd14 On dict, test $obj->code if empty before translation 2021-06-04 17:10:26 +02:00
Laurent Destailleur
0147ffa737 Fix css 2021-06-04 14:38:22 +02:00
Laurent Destailleur
e8aec4824b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-04 14:37:05 +02:00
Laurent Destailleur
2182e7fd54 Look and feel v14 2021-06-04 14:36:52 +02:00
Francis Appels
326fe9f5e6 Merge remote-tracking branch 'Dolibarr/develop' into 14 2021-06-04 14:32:46 +02:00
Laurent Destailleur
27018bd4b4 Fix group by 2021-06-04 14:25:32 +02:00
Laurent Destailleur
f55be9fd3a
Merge pull request #17689 from DorianVabre/dev_EventOrganizer_suggest
new: working on conference or booth object and event type #FoundationFunding
2021-06-04 13:12:32 +02:00
Laurent Destailleur
333cd9f48a
Merge pull request #17750 from daraelmin/patch-2
Fix #17743 newpayement source membersubscription is member
2021-06-04 13:04:17 +02:00
Laurent Destailleur
bcd028c040
Merge pull request #17739 from fbosman/patch-6
Update card.php
2021-06-04 12:57:51 +02:00
Laurent Destailleur
8b5922a0df
Update card.php 2021-06-04 12:57:43 +02:00
Laurent Destailleur
43be7cf996
Update card.php 2021-06-04 12:56:40 +02:00
Laurent Destailleur
292d5f6a15
Update card.php 2021-06-04 12:55:03 +02:00
Laurent Destailleur
2feffa8ab3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-04 12:48:27 +02:00
Laurent Destailleur
34955b1cf9 Fix sql 2021-06-04 12:48:18 +02:00
Laurent Destailleur
3fb0dabae3
Merge pull request #17745 from FHenry/fix_dev_inventory_rollbac
fix: bad syntax  "rollbac" instead of "rollback"
2021-06-04 12:43:09 +02:00
Laurent Destailleur
d0fb90feed
Merge pull request #17736 from frederic34/patch-9
fix warnings
2021-06-04 12:42:53 +02:00
Laurent Destailleur
ff61a027e5
Merge pull request #17735 from frederic34/patch-8
fix warnings
2021-06-04 12:42:44 +02:00
Laurent Destailleur
8d77f498a8
Merge pull request #17734 from frederic34/patch-7
fix warning
2021-06-04 12:42:36 +02:00
Laurent Destailleur
d1d305e470
Merge pull request #17738 from frederic34/patch-11
fix bad setup of MAIN_USE_BACKGROUND_ON_PDF
2021-06-04 12:42:26 +02:00