Commit Graph

100555 Commits

Author SHA1 Message Date
Laurent Destailleur
7677edf41d
Merge pull request #16357 from bb2a/ADD_SUBSTITUTION_DELIVRY_DATE
Add substitution for delivry date
2021-02-22 14:23:37 +01:00
Laurent Destailleur
2346d8e12d
Merge pull request #16371 from frederic34/patch-2
add log for token reclaimed
2021-02-22 14:22:44 +01:00
Laurent Destailleur
9b6c7ee841
Merge pull request #16384 from frederic34/boxpropale
fix propal sqls
2021-02-22 14:19:37 +01:00
Laurent Destailleur
1c9eac8bd5
Merge pull request #16380 from frederic34/membersubscription
complete doaction hook
2021-02-22 14:18:38 +01:00
Laurent Destailleur
acf067d7f0
Merge pull request #16382 from defrance/patch-164
fix Notice error on install
2021-02-22 14:16:00 +01:00
Laurent Destailleur
40d23c5082
Update inc.php 2021-02-22 14:15:06 +01:00
Alexandre SPANGARO
d9e03e1373 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-02-22 14:10:38 +01:00
Frédéric FRANCE
84a5f69834
fix propal sqls 2021-02-22 13:14:13 +01:00
BENKE Charlene
8c95bc399a
fix Notice error on install 2021-02-22 13:12:06 +01:00
Laurent Destailleur
eed2974e9e
Merge pull request #16381 from frederic34/patch-3
fix box activity
2021-02-22 12:44:53 +01:00
Frédéric FRANCE
58f301389c
fix box activity 2021-02-22 12:08:22 +01:00
Alexandre SPANGARO
7f4040e464 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-02-22 11:59:13 +01:00
Laurent Destailleur
122538ca51 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-22 11:51:55 +01:00
Laurent Destailleur
38465ea591 Fix website editor 2021-02-22 11:51:43 +01:00
Laurent Destailleur
0be001c70b
Merge pull request #16374 from aspangaro/14a21
Code enhanced - Standardize field name #14697
2021-02-22 11:40:55 +01:00
Frédéric FRANCE
a0031901e4
complete doaction hook 2021-02-22 11:36:03 +01:00
Anthony Berton
566c3ada55 Update functions.lib.php 2021-02-22 11:30:00 +01:00
Alexandre SPANGARO
22c936ba19 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-02-22 11:28:36 +01:00
Frédéric FRANCE
1971f51973
Update main.inc.php 2021-02-22 11:24:21 +01:00
Laurent Destailleur
d787f5cc1a
Merge pull request #16370 from bafbes/abb120367
new:hook doActions for subscriptions with possibility to modify values of variables $datefrom,$dateto,$paymentdate inside hook
2021-02-22 11:23:03 +01:00
Laurent Destailleur
b4e301893c
Update subscription.php 2021-02-22 11:22:48 +01:00
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
Laurent Destailleur
cbe2bae032
Merge pull request #16373 from aspangaro/14a20
Code enhanced - Standardize field name #14697
2021-02-22 11:17:07 +01:00
Laurent Destailleur
a451d82a64
Merge pull request #16375 from frederic34/patch-3
cast getpost input
2021-02-22 11:15:33 +01:00
Laurent Destailleur
d6081d7d87 code comment 2021-02-22 11:13:12 +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
10008360e2 Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into NEW/add_real_payments_on_salaries 2021-02-22 09:29:47 +01:00
Gauthier PC portable 024
bc1d06e5cc FIX : wrong payment salary object on accounting-files.php 2021-02-22 09:19:03 +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
d04b04c10f Fix 2021-02-22 06:22:47 +01:00
Alexandre SPANGARO
267b095786 Fix import/export 2021-02-22 06:09:33 +01:00
Alexandre SPANGARO
70dddd9bdf Index & module 2021-02-22 05:58:46 +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
ca4023fe23 Migration 2021-02-22 05:31:01 +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
Frédéric FRANCE
370d70f578
Update card.php 2021-02-21 23:30:55 +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
Frédéric FRANCE
0e96093def
add log for token reclaimed 2021-02-21 21:51:26 +01:00
Alexandre SPANGARO
5fd2f33ade ChangeLog 2021-02-21 21:49:29 +01:00
Alexandre SPANGARO
ddea3f8a92 Code enhanced - Standardize field name #14697 2021-02-21 21:47:26 +01:00
Laurent Destailleur
a92f03d942
Merge pull request #16360 from aspangaro/14a20
Code enhanced - Standardize field name #14697
2021-02-21 20:28:42 +01:00