diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 1b7c67e40f9..bae4b0abd88 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -566,7 +566,7 @@ foreach ($dirmodels as $reldir)
else
{
print "
\n";
- print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'';
+ print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("SetAsDefault"),'switch_off').'';
print " | ";
}
@@ -578,7 +578,7 @@ foreach ($dirmodels as $reldir)
}
else
{
- print 'scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'';
+ print 'scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("SetAsDefault"),'off').'';
}
print '';
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index cd730352d79..7da8959fe71 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1394,6 +1394,11 @@ class Commande extends CommonOrder
return -2;
}
}
+ else
+ {
+ dol_syslog(get_class($this)."::addline status of order must be Draft to allow use of ->addline()", LOG_ERR);
+ return -3;
+ }
}
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index efd99fdb226..d9b55da40ec 100755
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -411,6 +411,7 @@ RefreshPhoneLink=Refresh link
LinkToTest=Clickable link generated for user %s (click phone number to test)
KeepEmptyToUseDefault=Keep empty to use default value
DefaultLink=Default link
+SetAsDefault=Set as default
ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
ExternalModule=External module - Installed into directory %s
BarcodeInitForThirdparties=Mass barcode init for thirdparties
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 3c43d92c3a6..704c46fe9cb 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1723,7 +1723,7 @@ div.tabs {
clear:both;
height:100%;
}
-div.tabsElem { margin-top: 8px; } /* To avoid overlap of tabs when not browser */
+div.tabsElem { margin-top: 6px; } /* To avoid overlap of tabs when not browser */
div.tabBar {
color: #;
@@ -1788,7 +1788,7 @@ a.tabTitle {
a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
font-family: ;
- padding: 5px 12px 5px;
+ padding: 7px 12px 7px;
margin: 0em 0.2em;
text-decoration: none;
white-space: nowrap;