diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php
index 65b38970a6e..0aa8b14199d 100644
--- a/htdocs/admin/index.php
+++ b/htdocs/admin/index.php
@@ -80,8 +80,8 @@ print img_picto('','puce').' '.$langs->trans("SetupDescription3", DOL_URL_ROOT.'
if (! empty($setupcompanynotcomplete))
{
$langs->load("errors");
- $warnpicto=img_warning($langs->trans("WarningMandatorySetupNotComplete"));
- print '
';
+ $warnpicto=img_warning($langs->trans("WarningMandatorySetupNotComplete"), 'style="padding-right: 6px;"');
+ print '
';
}
print '
';
print '
';
@@ -92,8 +92,8 @@ print img_picto('','puce').' '.$langs->trans("SetupDescription4", DOL_URL_ROOT.'
if (count($conf->modules) <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING)?1:$conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING)) // If only user module enabled
{
$langs->load("errors");
- $warnpicto=img_warning($langs->trans("WarningMandatorySetupNotComplete"));
- print '
';
+ $warnpicto=img_warning($langs->trans("WarningMandatorySetupNotComplete"), 'style="padding-right: 6px;"');
+ print '
';
}
print '
';
print '
';
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 7cbe0b439a1..bbdc6f94dfb 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -1149,10 +1149,10 @@ class Paiement extends CommonObject
$billsarray = $this->getBillsArray(); // From payment, the fk_soc isn't available, we should load the first supplier invoice to get him
if (!empty($billsarray))
{
- $supplier_invoice = new FactureFournisseur($this->db);
- if ($supplier_invoice->fetch($billsarray[0]) > 0)
+ $invoice = new Facture($this->db);
+ if ($invoice->fetch($billsarray[0]) > 0)
{
- $force_thirdparty_id = $supplier_invoice->fk_soc;
+ $force_thirdparty_id = $invoice->fk_soc;
}
}
}
diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index 4904f1ee5ca..1fa48738e66 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -28,6 +28,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+$langs->load("accountancy");
+
$socid = GETPOST('socid','int');
// Security check
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index dbcb5c78d5b..2b6820c353b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3096,7 +3096,7 @@ function img_info($titlealt = 'default')
* Show warning logo
*
* @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
- * @param string $moreatt Add more attribute on img tag (For example 'style="float: right"'). If 1
+ * @param string $moreatt Add more attribute on img tag (For example 'style="float: right"'). If 1, add float: right. Can't be "class" attribute.
* @return string Return img tag
*/
function img_warning($titlealt = 'default', $moreatt = '')
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 7e3ba9a95d9..def3e357ac1 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -3125,15 +3125,29 @@ div.ok {
color: #114466;
}
+/* Info admin */
+div.info {
+ border-: solid 5px #87cfd2;
+ padding-top: 8px;
+ padding-left: 10px;
+ padding-right: 4px;
+ padding-bottom: 8px;
+ margin: 0.5em 0em 0.5em 0em;
+ background: #eff8fc;
+}
+
/* Warning message */
div.warning {
- color: #302020;
- padding: 0.3em 0.3em 0.3em 0.3em;
- margin: 0.5em 0em 0.5em 0em;
- border: 2px solid #805000;
- -webkit-border-radius: 4px;
- border-radius: 4px;
- text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+ border-: solid 5px #f2cf87;
+ padding-top: 8px;
+ padding-left: 10px;
+ padding-right: 4px;
+ padding-bottom: 8px;
+ margin: 0.5em 0em 0.5em 0em;
+ background: #fcf8e3;
+}
+div.warning a, div.info a, div.error a {
+ color: rgb();
}
/* Error message */
@@ -3141,19 +3155,6 @@ div.error {
background: #EFCFCF;
}
-/* Info admin */
-div.info {
- color: #fff;
- padding: 0.4em 0.4em 0.4em 0.4em;
- margin: 0.5em 0em 0.5em 0em;
- -webkit-border-radius: 4px;
- border-radius: 4px;
- background: #798080;
-}
-
-div.warning a, div.info a, div.error a {
- color: rgb();
-}
/*
* Liens Payes/Non payes
@@ -4947,7 +4948,7 @@ div.tabsElem a.tab {
/* nboftopmenuentries = , fontsize= */
/* rule to reduce top menu - 1st reduction */
-@media only screen and (max-width: px) /* reduction 1 */
+@media only screen and (max-width: px) /* reduction 1 */
{
div.tmenucenter {
width: px; /* size of viewport */
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index c4fab72464b..0d3359364e3 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -3181,17 +3181,29 @@ div.ok {
color: #114466;
}
+/* Info admin */
+div.info {
+ border-: solid 5px #87cfd2;
+ padding-top: 8px;
+ padding-left: 10px;
+ padding-right: 4px;
+ padding-bottom: 8px;
+ margin: 0.5em 0em 0.5em 0em;
+ background: #eff8fc;
+}
+
/* Warning message */
div.warning {
- color: #302020;
- padding: 0.3em 0.3em 0.3em 0.3em;
- margin: 0.5em 0em 0.5em 0em;
- /* border: 1px solid #e0d0b0; */
- border: 2px solid #805000
- -webkit-border-radius: 3px;
- border-radius: 3px;
- /* background: #EFDF9A; */
- text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+ border-: solid 5px #f2cf87;
+ padding-top: 8px;
+ padding-left: 10px;
+ padding-right: 4px;
+ padding-bottom: 8px;
+ margin: 0.5em 0em 0.5em 0em;
+ background: #fcf8e3;
+}
+div.warning a, div.info a, div.error a {
+ color: rgb();
}
/* Error message */
@@ -3205,19 +3217,6 @@ div.error {
background: #EFCFCF;
}
-/* Info admin */
-div.info {
- color: #fff;
- padding: 0.4em 0.4em 0.4em 0.4em;
- margin: 0.5em 0em 0.5em 0em;
- -webkit-border-radius: 4px;
- border-radius: 4px;
- background: #989;
-}
-
-div.warning a, div.info a, div.error a {
- color: rgb();
-}
/*
* Liens Payes/Non payes