Commit Graph

93006 Commits

Author SHA1 Message Date
Laurent Destailleur
56ff2ef010
Merge pull request #15566 from frederic34/mailingcard
remove warnings
2020-12-27 14:11:04 +01:00
Frédéric FRANCE
12f4a74a74
Merge remote-tracking branch 'upstream/develop' into mailingcard 2020-12-27 14:04:04 +01:00
Laurent Destailleur
a1d9554672
Merge pull request #15813 from dolibit-ut/patch-58
Update ChangeLog
2020-12-27 13:54:59 +01:00
Laurent Destailleur
f98f9504f0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-24 13:07:39 +01:00
Laurent Destailleur
58cd7c97a5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/comm/mailing/card.php
	htdocs/comm/mailing/cibles.php
	htdocs/comm/mailing/class/mailing.class.php
2020-12-24 13:05:17 +01:00
Laurent Destailleur
3abceadb86 Add info 2020-12-24 13:02:45 +01:00
Laurent Destailleur
739695c442 Fix delay to wait between email for emailing refused float. 2020-12-24 12:49:17 +01:00
Laurent Destailleur
360a85cbbc FIX add autofix of count of email target when data is corrupted 2020-12-24 12:32:34 +01:00
Laurent Destailleur
5382bf1dd4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-24 03:07:46 +01:00
Laurent Destailleur
a0440fbe88 Removed warnings 2020-12-24 03:06:52 +01:00
Laurent Destailleur
5ef3ffbdc6 Fix warning 2020-12-24 03:03:38 +01:00
Laurent Destailleur
6c2a17b29a Fix warning 2020-12-24 02:59:00 +01:00
Laurent Destailleur
3586da75a2 Fix warning 2020-12-24 02:52:49 +01:00
Laurent Destailleur
ea0ae758a3 Fix warnings 2020-12-24 02:48:32 +01:00
Laurent Destailleur
11a122176d Clean code 2020-12-24 02:33:11 +01:00
Laurent Destailleur
e9129154e4 Log 2020-12-24 02:16:22 +01:00
Laurent Destailleur
65dc766765 Code comment 2020-12-24 02:12:13 +01:00
Laurent Destailleur
11b15557eb Clean code 2020-12-24 02:09:11 +01:00
Laurent Destailleur
e590fb36ad Log for debug 2020-12-24 01:53:36 +01:00
Laurent Destailleur
88e441412c CSS 2020-12-24 01:35:59 +01:00
Laurent Destailleur
5f943fece3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-24 01:13:54 +01:00
Laurent Destailleur
d0b6466595 Prepare v13 packaging 2020-12-24 00:52:05 +01:00
Laurent Destailleur
ac5d2d849b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-24 00:20:47 +01:00
Laurent Destailleur
b66ec5bc64 Fix css 2020-12-23 23:16:27 +01:00
Laurent Destailleur
02daf09928 Fix for php8 2020-12-23 23:06:34 +01:00
Laurent Destailleur
f8e4985de1 Trans 2020-12-23 22:30:29 +01:00
Laurent Destailleur
4471d7d1da FIX debug report expense/income 2020-12-23 22:18:38 +01:00
Laurent Destailleur
940f0484ee FIX debug report expense/income 2020-12-23 22:17:05 +01:00
Laurent Destailleur
d65dc85a10 FIX for php 8 2020-12-23 19:16:25 +01:00
Laurent Destailleur
1c73d38093 Fix api to download for shipments 2020-12-23 19:16:15 +01:00
Laurent Destailleur
5da9719681 Update doc 2020-12-23 19:16:07 +01:00
Laurent Destailleur
93d309cdbc FIX Update Restler API to 3.1.1 to fix error with php8 2020-12-23 19:15:58 +01:00
Laurent Destailleur
8e839a34e2 FIX for php 8 2020-12-23 19:14:47 +01:00
Laurent Destailleur
812b5f0c17 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-23 17:37:45 +01:00
Laurent Destailleur
9f2c6f3f33 Fix api to download for shipments 2020-12-23 17:36:03 +01:00
Laurent Destailleur
abf8bc2b92 Update doc 2020-12-23 17:26:25 +01:00
Laurent Destailleur
fd8bfcfd3b FIX Update Restler API to 3.1.1 to fix error with php8 2020-12-23 17:25:38 +01:00
UT from dolibit
9bd6cf8bbb
Update ChangeLog 2020-12-23 16:22:49 +01:00
Laurent Destailleur
9007e7be2a Fix sql for postgresql 2020-12-23 16:13:45 +01:00
Laurent Destailleur
d3f352fe10 Fix log 2020-12-23 15:52:00 +01:00
Laurent Destailleur
b036641ded Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-23 15:48:27 +01:00
Laurent Destailleur
70df6130b5 Fix SQL to export categories of contact
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0

Conflicts:
	htdocs/product/class/product.class.php
2020-12-23 15:45:33 +01:00
Laurent Destailleur
af49c81281 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-23 15:40:46 +01:00
Laurent Destailleur
8658f903fa FIX Must delete extrafields before main table on product deletion. 2020-12-23 15:00:25 +01:00
Laurent Destailleur
b5731290c7 Fix scope 2020-12-23 13:33:33 +01:00
Laurent Destailleur
bf606ede12 Enhance remote ip detection 2020-12-23 13:27:30 +01:00
Laurent Destailleur
335eefe620 Fix link 2020-12-23 13:26:39 +01:00
Laurent Destailleur
53c6d92b0b Enhance remote ip detection 2020-12-23 13:17:40 +01:00
Laurent Destailleur
ec5a81e916 Enable missing module 2020-12-23 12:04:42 +01:00
Laurent Destailleur
740105ae08 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/emailcollector_card.php
2020-12-23 11:59:14 +01:00