Commit Graph

25468 Commits

Author SHA1 Message Date
Laurent Destailleur
c227275c55 Merge pull request #16379 from danielprowald/develop
CLOSE #16378 More E-Mail Contact substitution Values for better salutation
2021-02-22 11:20:03 +01:00
Laurent Destailleur
2673e93dfc Update card_presend.tpl.php 2021-02-22 11:19:47 +01:00
Laurent Destailleur
f99232e66e Merge branch 'develop' into 14a21 2021-02-22 11:18:07 +01:00
Daniel
7bbf1b4841 Fix Formatting 2021-02-22 10:04:29 +01:00
Daniel
38e1264588 For more flexible salutation in some languages the folloing Variables
are availible

__CONTACT_LASTNAME_XXX__
__CONTACT_FIRSTNAME_XXX__
__CONTACT_SALUTATION_XXX__
2021-02-22 09:56:48 +01:00
Gauthier PC portable 024
939d406ab1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-22 09:10:24 +01:00
Alexandre SPANGARO
267b095786 Fix import/export 2021-02-22 06:09:33 +01:00
Alexandre SPANGARO
ae4fc565e1 Widget & commonobject 2021-02-22 05:38:31 +01:00
Alexandre SPANGARO
d7993253e7 Export 2021-02-22 05:33:40 +01:00
Alexandre SPANGARO
dfb6490bb4 Fix export 2021-02-22 05:24:39 +01:00
Alexandre SPANGARO
116a491ae1 Revert "Fix export"
This reverts commit 01e351e87e.
2021-02-22 05:23:02 +01:00
Alexandre SPANGARO
01e351e87e Fix export 2021-02-22 05:19:48 +01:00
Alexandre SPANGARO
71ce871da6 Fix element 2021-02-22 05:13:14 +01:00
Anthony Berton
3256a17280 Update functions.lib.php 2021-02-21 23:52:22 +01:00
Alexandre SPANGARO
818a826c3e Code enhanced - Standardize field name 2021-02-21 22:10:00 +01:00
Alexandre SPANGARO
2cd181b86d Code enhanced - Standardize field name #14697 2021-02-21 22:07:58 +01:00
Alexandre SPANGARO
ddea3f8a92 Code enhanced - Standardize field name #14697 2021-02-21 21:47:26 +01:00
Laurent Destailleur
e3419df36e Merge branch 'develop' into 14a20 2021-02-21 20:28:06 +01:00
Laurent Destailleur
97ce13bf84 Merge pull request #16369 from frederic34/doltrunc
replace ... by one char in dol_trunc
2021-02-21 20:16:07 +01:00
Laurent Destailleur
c9f67b27b2 Merge pull request #16364 from frederic34/memcacheexpire
memcached can set expire
2021-02-21 20:14:09 +01:00
Laurent Destailleur
4bf7c89d4e Merge pull request #16363 from frederic34/patch-2
fix propal box
2021-02-21 19:19:08 +01:00
Laurent Destailleur
1e62a1a13f Merge pull request #16359 from aspangaro/14a19
Code enhanced - Standardize field name #14697
2021-02-21 19:18:33 +01:00
Frédéric FRANCE
71d32a7422 fix tests 2021-02-21 15:59:19 +01:00
Frédéric FRANCE
5ceb8163de fix tests 2021-02-21 15:40:03 +01:00
Laurent Destailleur
0a7e692fbf Wip website module 2021-02-21 14:46:52 +01:00
Frédéric FRANCE
548820011a fix tests 2021-02-21 13:39:59 +01:00
Frédéric FRANCE
6e3a1a1d41 fix tests 2021-02-21 13:32:54 +01:00
Frédéric FRANCE
d3a98c7680 replace ... by one char in dol_trunc 2021-02-21 13:00:31 +01:00
Florian HENRY
be34fb4541 tab event ok 2021-02-21 12:32:16 +01:00
Frédéric FRANCE
5096c5bf2d cache socialnetworks array 2021-02-21 10:18:05 +01:00
Frédéric FRANCE
41b89ae677 add files and links 2021-02-21 09:50:58 +01:00
Florian HENRY
556ba2b369 statart card 2021-02-20 23:17:48 +01:00
Frédéric FRANCE
518826ad3d add project 2021-02-20 22:03:11 +01:00
Frédéric FRANCE
65925e60b9 memcached can set expire 2021-02-20 20:48:59 +01:00
Frédéric FRANCE
da37497a38 memcached can set expire 2021-02-20 20:47:01 +01:00
Laurent Destailleur
91d0652476 Clean code of cache 2021-02-20 18:32:16 +01:00
Laurent Destailleur
1dd1dcefc5 Rename cache keys 2021-02-20 18:25:48 +01:00
Laurent Destailleur
341cd06252 Clean code for cache feature 2021-02-20 18:21:10 +01:00
Frédéric FRANCE
997dee67af fix propal box 2021-02-20 17:42:51 +01:00
Laurent Destailleur
07578fc518 Merge branch 'develop' into countactioncomm 2021-02-20 17:24:22 +01:00
Laurent Destailleur
cfccc49235 Code comment 2021-02-20 17:23:03 +01:00
Frédéric FRANCE
57e15eb46d try to apply the advice 2021-02-20 17:12:06 +01:00
Laurent Destailleur
4b632fb24f Merge branch 'develop' into 14a19 2021-02-20 17:08:23 +01:00
Laurent Destailleur
c56c97b1b2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-20 17:03:44 +01:00
Laurent Destailleur
ade5d98d56 Rename script to run cron by url to avoid confusion with script from cli 2021-02-20 17:03:27 +01:00
Laurent Destailleur
7c25f06f58 Merge pull request #16353 from aspangaro/14a18
Code enhanced - Standardize field name #14697
2021-02-20 16:51:34 +01:00
Frédéric FRANCE
ec1dd40a8a enhance caching 2021-02-20 15:52:45 +01:00
Frédéric FRANCE
99fa13cbad enhance caching 2021-02-20 15:41:57 +01:00
Alexandre SPANGARO
3dcfe40e71 Code enhanced - Standardize field name #14697 2021-02-20 08:00:27 +01:00
Alexandre SPANGARO
1017d480f9 Code enhanced - Standardize field name #14697 2021-02-20 07:08:37 +01:00