';
- print '| '.$langs->trans("ServiceStatus").': '.$object->lines[$cursorline - 1]->getLibStatut(4).' | ';
+ print ''.$langs->trans("ServiceStatus").': '.$object->lines[$cursorline - 1]->getLibStatut(4).' | ';
print '';
if ($user->socid == 0) {
if ($object->statut > 0 && $action != 'activateline' && $action != 'unactivateline') {
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index cb710c19875..7d261f2d5ab 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -1948,7 +1948,9 @@ function show_subsidiaries($conf, $langs, $db, $object)
$socstatic = new Societe($db);
print load_fiche_titre($langs->trans("Subsidiaries"), '', '');
- print "\n".''."\n";
+
+ print "\n".''."\n";
+ print ' '."\n";
print '| '.$langs->trans("Company").' | ';
print ''.$langs->trans("Address").' | '.$langs->trans("Zip").' | ';
@@ -1976,17 +1978,17 @@ function show_subsidiaries($conf, $langs, $db, $object)
print ' ';
- print '| ';
+ print ' | ';
print $socstatic->getNomUrl(1);
print ' | ';
- print ''.$obj->address.' | ';
- print ''.$obj->zip.' | ';
- print ''.$obj->town.' | ';
- print ''.$obj->code_client.' | ';
+ print ''.dol_escape_htmltag($obj->address).' | ';
+ print ''.$obj->zip.' | ';
+ print ''.$obj->town.' | ';
+ print ''.$obj->code_client.' | ';
print '';
- print '';
+ print '';
print img_edit();
print ' | ';
@@ -1994,6 +1996,7 @@ function show_subsidiaries($conf, $langs, $db, $object)
$i++;
}
print "\n \n";
+ print ' '."\n";
}
print " \n";
diff --git a/htdocs/core/modules/barcode/modules_barcode.class.php b/htdocs/core/modules/barcode/modules_barcode.class.php
index 99fc8ed366d..01a00405452 100644
--- a/htdocs/core/modules/barcode/modules_barcode.class.php
+++ b/htdocs/core/modules/barcode/modules_barcode.class.php
@@ -138,7 +138,7 @@ abstract class ModeleNumRefBarCode
{
global $conf;
- $langs->load("admin");
+ $langs->loadLangs(array("admin", "companies"));
$s = '';
$s .= $langs->trans("Name").': '.$this->name.' ';
diff --git a/htdocs/core/modules/product/mod_codeproduct_elephant.php b/htdocs/core/modules/product/mod_codeproduct_elephant.php
index 5936476e079..0b03bd9b6a4 100644
--- a/htdocs/core/modules/product/mod_codeproduct_elephant.php
+++ b/htdocs/core/modules/product/mod_codeproduct_elephant.php
@@ -118,7 +118,7 @@ class mod_codeproduct_elephant extends ModeleProductCode
$texte .= '| '.$langs->trans("Mask").' ('.$langs->trans("ProductCodeModel").'): | ';
$texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' | ';
- $texte .= ' | ';
+ $texte .= ' | ';
$texte .= ' ';
diff --git a/htdocs/core/modules/product/modules_product.class.php b/htdocs/core/modules/product/modules_product.class.php
index e0141348568..fef12717e3b 100644
--- a/htdocs/core/modules/product/modules_product.class.php
+++ b/htdocs/core/modules/product/modules_product.class.php
@@ -193,7 +193,8 @@ abstract class ModeleProductCode
{
global $conf;
- $langs->load("admin");
+ $langs->loadLangs(array("admin", "companies"));
+
$strikestart = '';
$strikeend = '';
if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) {
diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php
index 28d0120da72..09f6cb9c29d 100644
--- a/htdocs/core/modules/societe/modules_societe.class.php
+++ b/htdocs/core/modules/societe/modules_societe.class.php
@@ -198,7 +198,8 @@ abstract class ModeleThirdPartyCode
{
global $conf;
- $langs->load("admin");
+ $langs->loadLangs(array("admin", "companies"));
+
$strikestart = '';
$strikeend = '';
if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) {
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 82229198185..1513eb6ea96 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -1296,11 +1296,11 @@ class Holiday extends CommonObject
*
* @param int $selected Id of preselected status
* @param string $htmlname Name of HTML select field
+ * @param string $morecss More CSS on select component
* @return string Show select of status
*/
- public function selectStatutCP($selected = '', $htmlname = 'select_statut')
+ public function selectStatutCP($selected = '', $htmlname = 'select_statut', $morecss = 'minwidth125')
{
-
global $langs;
// Liste des statuts
@@ -1308,7 +1308,7 @@ class Holiday extends CommonObject
$nb = count($name) + 1;
// Select HTML
- $out = ' |