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
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
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
c29347b0f8
Merge pull request #17740 from dolibit-ut/patch-334
...
Update llx_c_email_templates.sql
2021-06-04 12:40:33 +02:00
Laurent Destailleur
8d5c419f92
Merge pull request #17744 from fappels/14_fix_trigger_delete_dispatch
...
Fix dispatch receipt edit and delete
2021-06-04 12:37:05 +02:00
Laurent Destailleur
a48b18aced
Merge pull request #17741 from dolibit-ut/patch-335
...
Update llx_c_chargesociales.sql
2021-06-04 12:35:37 +02:00
Laurent Destailleur
a94ef88549
Merge pull request #17748 from frederic34/patch-13
...
Update pdf_canelle.modules.php
2021-06-04 12:34:27 +02:00
Laurent Destailleur
5f3296fa70
Merge pull request #17737 from frederic34/patch-10
...
fix warnings
2021-06-04 12:34:07 +02:00
Laurent Destailleur
5a3d7663d1
Merge pull request #17764 from Hystepik/develop#3
...
Fix of a bug on mass mailing
2021-06-04 12:32:48 +02:00
Laurent Destailleur
f656214a66
Merge pull request #17746 from frederic34/patch-12
...
doxygen
2021-06-04 12:32:26 +02:00
Laurent Destailleur
e5ab721660
Fix sanitize
2021-06-04 12:30:46 +02:00
Laurent Destailleur
920f8b0b58
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-04 12:29:04 +02:00
Laurent Destailleur
3dd53f58f9
Merge pull request #17759 from Hystepik/develop#1
...
Fix inventory/inventory.php
2021-06-04 12:28:55 +02:00
lmarcouiller
c77dee0922
changes to fetch after send
2021-06-04 12:27:50 +02:00
Laurent Destailleur
e26f0f155f
Update inventory.php
2021-06-04 12:00:54 +02:00
Laurent Destailleur
1136e7dec5
Update inventory.php
2021-06-04 11:57:59 +02:00
Laurent Destailleur
84f2e06b91
Merge pull request #17754 from frederic34/patch-16
...
fix warnings
2021-06-04 11:55:14 +02:00
Laurent Destailleur
08b44b3348
Merge pull request #17755 from frederic34/patch-17
...
fix warning
2021-06-04 11:54:58 +02:00
Laurent Destailleur
900cfb7a9d
Merge pull request #17756 from frederic34/patch-18
...
fix warnings
2021-06-04 11:54:38 +02:00
Laurent Destailleur
f7c5a9e13a
Merge pull request #17757 from frederic34/patch-19
...
fix warning
2021-06-04 11:54:26 +02:00
Laurent Destailleur
ca1da3c83c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-04 11:53:21 +02:00
Laurent Destailleur
e73dad30bb
Warning
2021-06-04 11:53:12 +02:00
Laurent Destailleur
702de427bd
Merge pull request #17758 from frederic34/patch-20
...
fix warnings
2021-06-04 11:52:53 +02:00
Laurent Destailleur
2dc1cd45d2
Merge pull request #17753 from frederic34/patch-15
...
fix warnings
2021-06-04 11:52:36 +02:00
Laurent Destailleur
5650deec58
Merge branch 'develop' into patch-15
2021-06-04 11:52:29 +02:00
Laurent Destailleur
c67ea954f7
Merge pull request #17752 from frederic34/patch-14
...
fix warnings
2021-06-04 11:51:01 +02:00
Laurent Destailleur
bd72edc534
Merge pull request #17760 from Hystepik/develop#2
...
Fix error name of menu knowledge management system
2021-06-04 11:50:46 +02:00
Laurent Destailleur
c3ed30345e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-04 11:45:24 +02:00
Laurent Destailleur
8e80d65b7e
Merge pull request #17765 from softwehrler/fix-subledger-label
...
Fix label of subaccount
2021-06-04 11:42:35 +02:00
Laurent Destailleur
25a169e15b
Merge pull request #17766 from FHenry/fix_uploaddir_productlot
...
fix: uploaddir for productlot (fix #17675 )
2021-06-04 11:27:46 +02:00
