';
+
// Import key
if (! empty($object->import_key))
- print $langs->trans("ImportedWithSet").': '.$object->import_key.'
';
+ {
+ if ($usetable) print '| ';
+ print $langs->trans("ImportedWithSet");
+ if ($usetable) print ' | ';
+ else print ': ';
+ print $object->import_key;
+ if ($usetable) print ' |
';
+ else print '
';
+ }
// User creation
if (! empty($object->user_creation))
{
- print $langs->trans("CreatedBy").': ';
+ if ($usetable) print '| ';
+ print $langs->trans("CreatedBy");
+ if ($usetable) print ' | ';
+ else print ': ';
if (is_object($object->user_creation))
{
if ($object->user_creation->id) print $object->user_creation->getNomUrl(1);
@@ -239,21 +253,30 @@ function dol_print_object_info($object)
if ($userstatic->id) print $userstatic->getNomUrl(1);
else print $langs->trans("Unknown");
}
- print '
';
+ if ($usetable) print ' |
';
+ else print '
';
}
// Date creation
if (! empty($object->date_creation))
{
- print $langs->trans("DateCreation").': '.dol_print_date($object->date_creation, 'dayhour');
+ if ($usetable) print '| ';
+ print $langs->trans("DateCreation");
+ if ($usetable) print ' | ';
+ else print ': ';
+ print dol_print_date($object->date_creation, 'dayhour');
if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' / '.dol_print_date($object->date_creation+($deltadateforuser*3600),"dayhour").' '.$langs->trans("ClientHour");
- print '
';
+ if ($usetable) print ' |
';
+ else print '
';
}
// User change
if (! empty($object->user_modification))
{
- print $langs->trans("ModifiedBy").': ';
+ if ($usetable) print '| ';
+ print $langs->trans("ModifiedBy");
+ if ($usetable) print ' | ';
+ else print ': ';
if (is_object($object->user_modification))
{
if ($object->user_modification->id) print $object->user_modification->getNomUrl(1);
@@ -266,21 +289,30 @@ function dol_print_object_info($object)
if ($userstatic->id) print $userstatic->getNomUrl(1);
else print $langs->trans("Unknown");
}
- print '
';
+ if ($usetable) print ' |
';
+ else print '
';
}
// Date change
if (! empty($object->date_modification))
{
- print $langs->trans("DateLastModification").': '.dol_print_date($object->date_modification, 'dayhour');
+ if ($usetable) print '| ';
+ print $langs->trans("DateLastModification");
+ if ($usetable) print ' | ';
+ else print ': ';
+ print dol_print_date($object->date_modification, 'dayhour');
if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' / '.dol_print_date($object->date_modification+($deltadateforuser*3600),"dayhour").' '.$langs->trans("ClientHour");
- print '
';
+ if ($usetable) print ' |
';
+ else print '
';
}
// User validation
if (! empty($object->user_validation))
{
- print $langs->trans("ValidatedBy").': ';
+ if ($usetable) print '| ';
+ print $langs->trans("ValidatedBy");
+ if ($usetable) print ' | ';
+ else print ': ';
if (is_object($object->user_validation))
{
if ($object->user_validation->id) print $object->user_validation->getNomUrl(1);
@@ -293,21 +325,30 @@ function dol_print_object_info($object)
if ($userstatic->id) print $userstatic->getNomUrl(1);
else print $langs->trans("Unknown");
}
- print '
';
+ if ($usetable) print ' |
';
+ else print '
';
}
// Date validation
if (! empty($object->date_validation))
{
- print $langs->trans("DateValidation").': '.dol_print_date($object->date_validation, 'dayhour');
+ if ($usetable) print '| ';
+ print $langs->trans("DateValidation");
+ if ($usetable) print ' | ';
+ else print ': ';
+ print dol_print_date($object->date_validation, 'dayhour');
if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' / '.dol_print_date($object->date_validation+($deltadateforuser*3600),"dayhour").' '.$langs->trans("ClientHour");
- print '
';
+ if ($usetable) print ' |
';
+ else print '
';
}
// User approve
if (! empty($object->user_approve))
{
- print $langs->trans("ApprovedBy").': ';
+ if ($usetable) print '| ';
+ print $langs->trans("ApprovedBy");
+ if ($usetable) print ' | ';
+ else print ': ';
if (is_object($object->user_approve))
{
if ($object->user_approve->id) print $object->user_approve->getNomUrl(1);
@@ -320,21 +361,30 @@ function dol_print_object_info($object)
if ($userstatic->id) print $userstatic->getNomUrl(1);
else print $langs->trans("Unknown");
}
- print '
';
+ if ($usetable) print ' |
';
+ else print '
';
}
// Date approve
if (! empty($object->date_approve))
{
- print $langs->trans("DateApprove").': '.dol_print_date($object->date_approve, 'dayhour');
+ if ($usetable) print '| ';
+ print $langs->trans("DateApprove");
+ if ($usetable) print ' | ';
+ else print ': ';
+ print dol_print_date($object->date_approve, 'dayhour');
if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' / '.dol_print_date($object->date_approve+($deltadateforuser*3600),"dayhour").' '.$langs->trans("ClientHour");
- print '
';
+ if ($usetable) print ' |
';
+ else print '
';
}
// User close
if (! empty($object->user_cloture))
{
- print $langs->trans("ClosedBy").': ';
+ if ($usetable) print '| ';
+ print $langs->trans("ClosedBy");
+ if ($usetable) print ' | ';
+ else print ': ';
if (is_object($object->user_cloture))
{
if ($object->user_cloture->id) print $object->user_cloture->getNomUrl(1);
@@ -347,21 +397,30 @@ function dol_print_object_info($object)
if ($userstatic->id) print $userstatic->getNomUrl(1);
else print $langs->trans("Unknown");
}
- print '
';
+ if ($usetable) print ' |
';
+ else print '
';
}
// Date close
if (! empty($object->date_cloture))
{
- print $langs->trans("DateClosing").': '.dol_print_date($object->date_cloture, 'dayhour');
+ if ($usetable) print '| ';
+ print $langs->trans("DateClosing");
+ if ($usetable) print ' | ';
+ else print ': ';
+ print dol_print_date($object->date_cloture, 'dayhour');
if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' / '.dol_print_date($object->date_cloture+($deltadateforuser*3600),"dayhour").' '.$langs->trans("ClientHour");
- print '
';
+ if ($usetable) print ' |
';
+ else print '
';
}
// User conciliate
if (! empty($object->user_rappro))
{
- print $langs->trans("ConciliatedBy").': ';
+ if ($usetable) print '| ';
+ print $langs->trans("ConciliatedBy");
+ if ($usetable) print ' | ';
+ else print ': ';
if (is_object($object->user_rappro))
{
if ($object->user_rappro->id) print $object->user_rappro->getNomUrl(1);
@@ -374,24 +433,37 @@ function dol_print_object_info($object)
if ($userstatic->id) print $userstatic->getNomUrl(1);
else print $langs->trans("Unknown");
}
- print '
';
+ if ($usetable) print ' |
';
+ else print '
';
}
// Date conciliate
if (! empty($object->date_rappro))
{
- print $langs->trans("DateConciliating").': '.dol_print_date($object->date_rappro, 'dayhour');
+ if ($usetable) print '| ';
+ print $langs->trans("DateConciliating");
+ if ($usetable) print ' | ';
+ else print ': ';
+ print dol_print_date($object->date_rappro, 'dayhour');
if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' / '.dol_print_date($object->date_rappro+($deltadateforuser*3600),"dayhour").' '.$langs->trans("ClientHour");
- print '
';
+ if ($usetable) print ' |
';
+ else print '
';
}
// Date send
if (! empty($object->date_envoi))
{
- print $langs->trans("DateLastSend").': '.dol_print_date($object->date_envoi, 'dayhour');
+ if ($usetable) print '| ';
+ print $langs->trans("DateLastSend");
+ if ($usetable) print ' | ';
+ else print ': ';
+ print dol_print_date($object->date_envoi, 'dayhour');
if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' / '.dol_print_date($object->date_envoi+($deltadateforuser*3600),"dayhour").' '.$langs->trans("ClientHour");
- print '
';
+ if ($usetable) print ' |
';
+ else print '
';
}
+
+ if ($usetable) print '
';
}
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index 482846032dc..7baed59a0ad 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -53,7 +53,7 @@ class modAgenda extends DolibarrModules
$this->module_position = 15;
// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
$this->name = preg_replace('/^mod/i','',get_class($this));
- $this->description = "Gestion de l'agenda et des actions";
+ $this->description = "Follow events or rendez-vous. Record manual events into Agendas or let application record automatic events for log tracking.";
$this->version = 'dolibarr'; // 'experimental' or 'dolibarr' or version
// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 66f9582cfc0..2677d06ec7b 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -198,7 +198,7 @@ if ($id > 0 || ! empty($ref))
print '