';
if (!$i) {
$totalarray['nbfield']++;
@@ -2331,7 +2331,7 @@ while ($i < $imaxinloop) {
// State
if (!empty($arrayfields['state.nom']['checked'])) {
- print "
".$obj->state_name."
\n";
+ print "
".dolPrintLabel($obj->state_name)."
\n";
if (!$i) {
$totalarray['nbfield']++;
}
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index a5231a73b6e..fb7e1cf1e97 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -2374,7 +2374,9 @@ class EmailCollector extends CommonObject
$description = $descriptiontitle = $descriptionmeta = $descriptionfull = '';
- $descriptiontitle = $langs->trans("RecordCreatedByEmailCollector", $this->ref, $msgid);
+ $descriptiontitle = $langs->transnoentitiesnoconv("RecordCreatedByEmailCollector", $this->ref);
+
+ $descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("EmailMsgID").' : '.dol_escape_htmltag($msgid));
$descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("MailTopic").' : '.dol_escape_htmltag($subject));
$descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("MailDate").($langs->trans("MailDate") != 'Date' ? ' (Date)' : '').' : '.dol_escape_htmltag(dol_print_date($dateemail, "dayhourtext", "gmt")));
$descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("MailFrom").($langs->trans("MailFrom") != 'From' ? ' (From)' : '').' : '.dol_escape_htmltag($fromstring));
@@ -2765,7 +2767,7 @@ class EmailCollector extends CommonObject
}
$description = $descriptiontitle;
- $description = dol_concatdesc($description, "-----");
+
$description = dol_concatdesc($description, $descriptionmeta);
$description = dol_concatdesc($description, "-----");
$description = dol_concatdesc($description, $messagetext);
@@ -3056,7 +3058,7 @@ class EmailCollector extends CommonObject
}
$description = $descriptiontitle;
- $description = dol_concatdesc($description, "-----");
+
$description = dol_concatdesc($description, $descriptionmeta);
$description = dol_concatdesc($description, "-----");
$description = dol_concatdesc($description, $messagetext);
@@ -3191,7 +3193,7 @@ class EmailCollector extends CommonObject
}
$description = $descriptiontitle;
- $description = dol_concatdesc($description, "-----");
+
$description = dol_concatdesc($description, $descriptionmeta);
$description = dol_concatdesc($description, "-----");
$description = dol_concatdesc($description, $messagetext);
@@ -3204,9 +3206,9 @@ class EmailCollector extends CommonObject
$tickettocreate->subject = $subject;
$tickettocreate->message = $description;
- $tickettocreate->type_code = (getDolGlobalString('MAIN_EMAILCOLLECTOR_TICKET_TYPE_CODE') ? $conf->global->MAIN_EMAILCOLLECTOR_TICKET_TYPE_CODE : dol_getIdFromCode($this->db, 1, 'c_ticket_type', 'use_default', 'code', 1));
- $tickettocreate->category_code = (getDolGlobalString('MAIN_EMAILCOLLECTOR_TICKET_CATEGORY_CODE') ? $conf->global->MAIN_EMAILCOLLECTOR_TICKET_CATEGORY_CODE : dol_getIdFromCode($this->db, 1, 'c_ticket_category', 'use_default', 'code', 1));
- $tickettocreate->severity_code = (getDolGlobalString('MAIN_EMAILCOLLECTOR_TICKET_SEVERITY_CODE') ? $conf->global->MAIN_EMAILCOLLECTOR_TICKET_SEVERITY_CODE : dol_getIdFromCode($this->db, 1, 'c_ticket_severity', 'use_default', 'code', 1));
+ $tickettocreate->type_code = (getDolGlobalString('MAIN_EMAILCOLLECTOR_TICKET_TYPE_CODE', dol_getIdFromCode($this->db, 1, 'c_ticket_type', 'use_default', 'code', 1)));
+ $tickettocreate->category_code = (getDolGlobalString('MAIN_EMAILCOLLECTOR_TICKET_CATEGORY_CODE', dol_getIdFromCode($this->db, 1, 'c_ticket_category', 'use_default', 'code', 1)));
+ $tickettocreate->severity_code = (getDolGlobalString('MAIN_EMAILCOLLECTOR_TICKET_SEVERITY_CODE', dol_getIdFromCode($this->db, 1, 'c_ticket_severity', 'use_default', 'code', 1)));
$tickettocreate->origin_email = $from;
$tickettocreate->origin_replyto = (!empty($replyto) ? $replyto : null);
$tickettocreate->origin_references = (!empty($headers['References']) ? $headers['References'] : null);
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 97639baed6d..13bc5e65085 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -1209,7 +1209,7 @@ if ($resql) {
}
if ($user->hasRight('fournisseur', 'facture', 'creer') || $user->hasRight("supplier_invoice", "creer")) {
- $arrayofmassactions['createbills'] = img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("CreateInvoiceForThisSupplier");
+ $arrayofmassactions['createbills'] = img_picto('', 'supplier_invoice', 'class="pictofixedwidth"').$langs->trans("CreateInvoiceForThisSupplier");
}
if ($permissiontodelete) {
$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 40e94f779e7..3570e6a36c4 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -182,7 +182,7 @@ Unanswered=Unanswered
Answered=Answered
IsNotAnAnswer=Is not answer (initial email)
IsAnAnswer=Is an answer of an initial email
-RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
+RecordCreatedByEmailCollector=Record created by the Email Collector %s
DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
DefaultStatusEmptyMandatory=Empty but mandatory
WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to %s. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index af8f850a858..7181b24d39b 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -404,7 +404,8 @@ PMPValueShort=WAP
mandatoryperiod=Mandatory periods
mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service. Note that the message is a warning and not a blocking error.
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.
+mandatoryHelper2=Note that the message is a warning and not a blocking error.
DefaultBOM=Default BOM
DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
Rank=Rank
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index b696e4806d8..af184e7cdd8 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1600,6 +1600,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
print 'mandatory_period == 1 ? ' checked="checked"' : '').'>';
print '';
@@ -2217,6 +2220,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
print 'mandatory_period == 1 ? ' checked="checked"' : '').'>';
print '';
@@ -2741,6 +2747,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
print ' ';
}
$htmltooltip = $langs->trans("mandatoryHelper");
+ if (!getDolGlobalString('SERVICE_STRICT_MANDATORY_PERIOD')) {
+ $htmltooltip .= ' '.$langs->trans("mandatoryHelper2");
+ }
print 'mandatory_period == 1 ? ' checked="checked"' : '').' disabled>';
print $form->textwithpicto($langs->trans("mandatoryperiod"), $htmltooltip, 1, 0);
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 719c24c8a49..ef49450cada 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -1139,20 +1139,18 @@ if ($action == 'create' || $action == 'presend') {
print '