diff --git a/dev/initdemo/documents_demo/medias/image/myimagesforemailing/dolicloud_logo_white.png b/dev/initdemo/documents_demo/medias/image/myimagesforemailing/dolicloud_logo_white.png new file mode 100644 index 0000000000000..3632504200d0f Binary files /dev/null and b/dev/initdemo/documents_demo/medias/image/myimagesforemailing/dolicloud_logo_white.png differ diff --git a/doc/images/dolibarr_screenshot10_1280x800.png b/doc/images/dolibarr_screenshot10_1280x800.png index 92892c7150bed..f5c878f8d2cdf 100644 Binary files a/doc/images/dolibarr_screenshot10_1280x800.png and b/doc/images/dolibarr_screenshot10_1280x800.png differ diff --git a/doc/images/dolibarr_screenshot2_1280x800.png b/doc/images/dolibarr_screenshot2_1280x800.png index 9f145db0f6af1..c5e30130c3eb4 100644 Binary files a/doc/images/dolibarr_screenshot2_1280x800.png and b/doc/images/dolibarr_screenshot2_1280x800.png differ diff --git a/doc/images/dolibarr_screenshot4_1280x800.png b/doc/images/dolibarr_screenshot4_1280x800.png index 90d5ed059b817..f76c6f07522c7 100644 Binary files a/doc/images/dolibarr_screenshot4_1280x800.png and b/doc/images/dolibarr_screenshot4_1280x800.png differ diff --git a/doc/images/dolibarr_screenshot5_1280x800.png b/doc/images/dolibarr_screenshot5_1280x800.png index 90aace0bfcb6b..96700f89bd517 100644 Binary files a/doc/images/dolibarr_screenshot5_1280x800.png and b/doc/images/dolibarr_screenshot5_1280x800.png differ diff --git a/doc/images/dolibarr_screenshot7_1280x800.png b/doc/images/dolibarr_screenshot7_1280x800.png index b17b57e571ed6..698bcac9c8f2c 100644 Binary files a/doc/images/dolibarr_screenshot7_1280x800.png and b/doc/images/dolibarr_screenshot7_1280x800.png differ diff --git a/doc/images/dolibarr_screenshot8_1280x800.png b/doc/images/dolibarr_screenshot8_1280x800.png index 6f2341297a6c3..14b9c3693b189 100644 Binary files a/doc/images/dolibarr_screenshot8_1280x800.png and b/doc/images/dolibarr_screenshot8_1280x800.png differ diff --git a/doc/images/dolibarr_screenshot9_1280x800.png b/doc/images/dolibarr_screenshot9_1280x800.png index 5c71c9395bb21..97310a4f4eb90 100644 Binary files a/doc/images/dolibarr_screenshot9_1280x800.png and b/doc/images/dolibarr_screenshot9_1280x800.png differ diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php index 73717696dc7ce..92dc2726030b2 100644 --- a/htdocs/comm/mailing/card.php +++ b/htdocs/comm/mailing/card.php @@ -876,7 +876,7 @@ { print "\n\n
\n"; - if (($object->statut == 0) && $user->rights->mailing->creer) + if (($object->statut == 0 || $object->statut == 1) && $user->rights->mailing->creer) { print ''.$langs->trans("EditMailing").''; } diff --git a/htdocs/theme/eldy/ckeditor/config.js b/htdocs/theme/eldy/ckeditor/config.js index cf7163671a36f..a397f5ec874ba 100644 --- a/htdocs/theme/eldy/ckeditor/config.js +++ b/htdocs/theme/eldy/ckeditor/config.js @@ -46,7 +46,7 @@ CKEDITOR.editorConfig = function( config ) // Used for mailing fields config.toolbar_dolibarr_mailings = [ - ['Source','Maximize'], + ['Source','Maximize','Preview'], ['Cut','Copy','Paste','-','SpellChecker'], ['Undo','Redo','-','Find','Replace'], ['Format','Font','FontSize'], diff --git a/htdocs/theme/md/ckeditor/config.js b/htdocs/theme/md/ckeditor/config.js index cf7163671a36f..a397f5ec874ba 100644 --- a/htdocs/theme/md/ckeditor/config.js +++ b/htdocs/theme/md/ckeditor/config.js @@ -46,7 +46,7 @@ CKEDITOR.editorConfig = function( config ) // Used for mailing fields config.toolbar_dolibarr_mailings = [ - ['Source','Maximize'], + ['Source','Maximize','Preview'], ['Cut','Copy','Paste','-','SpellChecker'], ['Undo','Redo','-','Find','Replace'], ['Format','Font','FontSize'],