Commit Graph

72176 Commits

Author SHA1 Message Date
ldestailleur
bc00fb177a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-02 19:42:15 +01:00
ldestailleur
a9e8e13bb6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	ChangeLog
	htdocs/user/param_ihm.php
2019-01-02 19:41:39 +01:00
ldestailleur
d8d47763aa Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-02 19:39:42 +01:00
ldestailleur
3d8479291d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-02 19:39:35 +01:00
JC Prieto
99e2f893fd Fix: loadBatchInfo() 2019-01-02 19:38:44 +01:00
Laurent Destailleur
bab501a1aa
Merge pull request #10294 from frederic34/patch-2
Update societe.class.php
2019-01-02 19:35:10 +01:00
ldestailleur
8645a7f524 FIX Interface regression for bind people. Fix option
MAIN_OPTIMIZEFORTEXTBROWSER
2019-01-02 18:58:45 +01:00
Frédéric FRANCE
cad95c7dc2
Update societe.class.php 2019-01-02 15:39:22 +01:00
ldestailleur
3af418349a FIX Can't empty the payment mode 2018-12-29 07:54:30 +01:00
ldestailleur
0353bd5302 FIX sql error when resetting payment mode / term 2018-12-29 07:48:47 +01:00
ldestailleur
2225d0a41e FIX sql error when resetting payment mode / term 2018-12-28 23:16:44 +01:00
ldestailleur
7b91c14cb3 FIX sql error when resetting payment mode / term 2018-12-28 23:14:41 +01:00
ldestailleur
c0eef25b31 FIX Can set payment mode to empty on thirdparty page 2018-12-28 23:14:36 +01:00
ldestailleur
2fef2b633a FIX sql error when resetting payment mode / term 2018-12-28 23:13:39 +01:00
ldestailleur
8ad06463e0 FIX Can set payment mode to empty on thirdparty page 2018-12-28 23:06:04 +01:00
Laurent Destailleur
713d71bd95 Fix menu 2018-12-28 12:51:54 +01:00
Laurent Destailleur
e0f94bbb59 Add role=navigation 2018-12-28 12:50:23 +01:00
Laurent Destailleur
3cd91d7c66 Fix look and feel v9 (autofocus) 2018-12-28 00:41:05 +01:00
Laurent Destailleur
d455cad724 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-27 21:31:52 +01:00
Laurent Destailleur
9842f50942 Fix substitution for members 2018-12-27 21:16:33 +01:00
Laurent Destailleur
a445e7597d FIX Popup when having notes of events 2018-12-27 06:37:17 +01:00
Laurent Destailleur
fadc9983dc Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-27 06:18:03 +01:00
Laurent Destailleur
cd53e22d64 FIX Edit description of event 2018-12-27 06:16:54 +01:00
Laurent Destailleur
07166f44ef Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-27 06:09:53 +01:00
Laurent Destailleur
64de31ef67 Clean log 2018-12-27 06:09:27 +01:00
Laurent Destailleur
deba3249f8 FIX Bad trigger name 2018-12-27 06:09:03 +01:00
Laurent Destailleur
8ab2ef0cf0 Add log 2018-12-27 06:08:48 +01:00
Laurent Destailleur
2b0240a1e2 Add log
Conflicts:
	htdocs/core/actions_massactions.inc.php
2018-12-27 06:08:24 +01:00
Laurent Destailleur
fb813fcfb1 Clean log 2018-12-27 06:06:32 +01:00
Laurent Destailleur
88ad059f25 FIX Bad trigger name 2018-12-27 06:04:55 +01:00
Laurent Destailleur
0ffefd71f3 Add log 2018-12-27 05:58:27 +01:00
Laurent Destailleur
ac7e759c17 Add log 2018-12-27 05:48:10 +01:00
Laurent Destailleur
eda3a5bc8c FIX Init of email topic when using a template 2018-12-27 05:18:16 +01:00
Laurent Destailleur
294107bba0 FIX vars for substitution must be null if not applicable (and not '') 2018-12-27 05:07:11 +01:00
Laurent Destailleur
6a708666b2 FIX vars for substitution must be null if not applicable (and not '') 2018-12-27 05:06:37 +01:00
Laurent Destailleur
0f76279a03 FIX Missing token and style 2018-12-27 03:46:14 +01:00
Laurent Destailleur
791b2f485a FIX Missing token and style 2018-12-27 03:45:30 +01:00
Laurent Destailleur
63beb50465 Fix missing migration of external site module 2018-12-26 21:22:12 +01:00
Laurent Destailleur
5c516fdae2 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
2018-12-26 19:43:01 +01:00
Laurent Destailleur
def732246d Clean dump 2018-12-26 19:16:05 +01:00
Laurent Destailleur
e7b3c91645 Fix dump file 2018-12-26 19:10:22 +01:00
Laurent Destailleur
730f5d1ad4 Prepare 8.0.4 2018-12-23 14:05:37 +01:00
Laurent Destailleur
7b61fc8fd1 Fix setup of dav module 2018-12-23 14:03:19 +01:00
Laurent Destailleur
35debd06fb List of events show user firstname by default 2018-12-23 01:28:36 +01:00
Laurent Destailleur
6557dcfb81 CSS 2018-12-23 00:49:26 +01:00
Laurent Destailleur
da3d1ab8b8 CSS 2018-12-23 00:24:10 +01:00
Laurent Destailleur
af6a7446ee
Merge pull request #9871 from laudeco/feature/fontawesome_migration
migrate font awesome to 5.4.1
2018-12-22 19:52:39 +01:00
Laurent Destailleur
e6f47717b5 Fix phpunit 2018-12-22 19:48:14 +01:00
Laurent Destailleur
fccd76aeae Fix phpcs 2018-12-22 19:25:08 +01:00
Laurent Destailleur
85375495e5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/class/product.class.php
	htdocs/public/notice.php
	htdocs/user/card.php
2018-12-22 19:06:58 +01:00