Commit Graph

93116 Commits

Author SHA1 Message Date
Regis Houssin
acabb045fb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2020-12-29 17:12:18 +01:00
Laurent Destailleur
9ab67bf728
Merge pull request #15819 from aspangaro/14a6
NEW: Accountancy - Format FEC - Add new field DateLimitReglmt
2020-12-29 17:09:14 +01:00
Laurent Destailleur
00aec1d3fe
Merge pull request #15821 from OPEN-DSI/new-invoice-list-margin-total
NEW add total margin in invoice list
2020-12-29 17:07:12 +01:00
Laurent Destailleur
c606e4b943 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-29 17:05:15 +01:00
Laurent Destailleur
01a94d22bb Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-29 17:05:07 +01:00
Laurent Destailleur
057945f693 Fix bad var 2020-12-29 17:04:39 +01:00
Laurent Destailleur
740cedeaac
Merge pull request #15824 from frederic34/scheduledjobs
remove warnings
2020-12-29 17:03:17 +01:00
Regis Houssin
325c2b03f8 FIX step by step 2020-12-29 17:02:35 +01:00
Laurent Destailleur
cef2057ff2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/societe/class/societe.class.php
	htdocs/webservices/server_productorservice.php
2020-12-29 17:01:24 +01:00
Laurent Destailleur
cefd66c18f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-29 16:56:39 +01:00
Laurent Destailleur
791cbb29c2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2020-12-29 16:55:58 +01:00
Laurent Destailleur
be2e3aa7a9
Merge pull request #15827 from fappels/13_php_warning_add_line
FIX add line php warning when no customer relative discount history.
2020-12-29 16:55:33 +01:00
Laurent Destailleur
b066e66c26
Merge pull request #15826 from FHenry/13.0
fix product/service list right
2020-12-29 16:54:55 +01:00
Laurent Destailleur
483ea559f5 Fix warning #15823 2020-12-29 16:54:28 +01:00
Laurent Destailleur
a2931a2795
Merge pull request #15823 from frederic34/stock_alerte
remove warnings
2020-12-29 16:51:33 +01:00
Frédéric FRANCE
e4c3499cad remove warnings
Conflicts:
	htdocs/societe/class/societe.class.php
2020-12-29 16:48:29 +01:00
Laurent Destailleur
36a3d47e11
Merge pull request #15825 from frederic34/societeclass
remove warnings
2020-12-29 16:47:16 +01:00
Laurent Destailleur
620a088827 Fix warning 2020-12-29 16:33:58 +01:00
Regis Houssin
20cd9cbbc7 FIX avoid warning php 8.0 2020-12-29 16:25:29 +01:00
Laurent Destailleur
87da0a276d Doc 2020-12-29 16:13:03 +01:00
Regis Houssin
6e0832fb38 FIX WIP avoid warning with php 8.0 2020-12-29 15:59:39 +01:00
Francis Appels
4267828ee6 FIX add line php warning when no customer relative discount history. 2020-12-29 14:47:16 +01:00
Laurent Destailleur
ae7d3abdc5 css 2020-12-29 05:00:51 +01:00
Laurent Destailleur
abca44be0d More logs 2020-12-29 04:52:47 +01:00
Laurent Destailleur
f498657071 Fix warning 2020-12-29 04:44:48 +01:00
Alexandre SPANGARO
2932e2f804 NEW: Accountancy - Add formconfirm with options on export 2020-12-29 04:33:47 +01:00
Laurent Destailleur
bf0a9fa137 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/societe/class/societe.class.php
2020-12-29 04:32:13 +01:00
Laurent Destailleur
c3326a0963 FIX Creation of thirdparty when setup is empty 2020-12-29 04:30:37 +01:00
Laurent Destailleur
af41c06822 Fix warnings 2020-12-29 04:27:16 +01:00
Laurent Destailleur
7b93c34c0f Fix phpunits 2020-12-29 03:48:11 +01:00
Laurent Destailleur
e07486b626 Fix columns of download of list of targets of emailing 2020-12-29 02:20:10 +01:00
Laurent Destailleur
d9a2e2e402 Responsive 2020-12-29 02:06:42 +01:00
Florian HENRY
af860a32bc fix product right 2020-12-28 21:19:25 +01:00
Frédéric FRANCE
fb5f4379da
remove warnings 2020-12-28 21:08:56 +01:00
Frédéric FRANCE
08bad6fc30
remove warnings 2020-12-28 20:54:29 +01:00
Frédéric FRANCE
9b3bbb723d
remove warnings 2020-12-28 20:37:33 +01:00
lvessiller
d4a19e5968 NEW add total margin in invoice list 2020-12-28 16:20:59 +01:00
Laurent Destailleur
b7cd27e76a Fix warning 2020-12-28 12:42:55 +01:00
Laurent Destailleur
8b696ced3b Clean code 2020-12-28 12:38:33 +01:00
Laurent Destailleur
7c3688c66f Fix var not defined 2020-12-28 12:36:36 +01:00
Laurent Destailleur
4b3cd947f2 Fix name of function 2020-12-28 12:33:00 +01:00
Laurent Destailleur
cec96b33ae Fix warning 2020-12-28 12:30:59 +01:00
Alexandre SPANGARO
5001cfce71 NEW: Accountancy - Format FEC - Add new field DateLimitReglmt 2020-12-28 04:12:23 +01:00
Laurent Destailleur
eac711f96c Debug v13 2020-12-27 21:41:39 +01:00
Laurent Destailleur
6421f757dc FIX Can delete a directory created manually that can not be indexed 2020-12-27 21:21:13 +01:00
Laurent Destailleur
4a8e72c997 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/ecm/file_card.php
2020-12-27 21:00:07 +01:00
Laurent Destailleur
d1d4914684 Sanitize data 2020-12-27 20:49:54 +01:00
Laurent Destailleur
6b03a2d264 Sanitize data 2020-12-27 20:49:40 +01:00
Laurent Destailleur
a6cd34739e Doxygen 2020-12-27 20:43:18 +01:00
Laurent Destailleur
e89a410e59 Fix warning 2020-12-27 20:33:07 +01:00