FIX #11369
This commit is contained in:
parent
bf71731fc9
commit
6d38f5ec9c
@ -165,7 +165,7 @@ class BOM extends CommonObject
|
|||||||
*/
|
*/
|
||||||
public function __construct(DoliDB $db)
|
public function __construct(DoliDB $db)
|
||||||
{
|
{
|
||||||
global $conf, $langs, $user;
|
global $conf, $langs;
|
||||||
|
|
||||||
$this->db = $db;
|
$this->db = $db;
|
||||||
|
|
||||||
@ -184,11 +184,11 @@ class BOM extends CommonObject
|
|||||||
// Translate some data of arrayofkeyval
|
// Translate some data of arrayofkeyval
|
||||||
foreach($this->fields as $key => $val)
|
foreach($this->fields as $key => $val)
|
||||||
{
|
{
|
||||||
if (is_array($this->fields['status']['arrayofkeyval']))
|
if (is_array($this->fields[$key]['arrayofkeyval']))
|
||||||
{
|
{
|
||||||
foreach($this->fields['status']['arrayofkeyval'] as $key2 => $val2)
|
foreach($this->fields[$key]['arrayofkeyval'] as $key2 => $val2)
|
||||||
{
|
{
|
||||||
$this->fields['status']['arrayofkeyval'][$key2]=$langs->trans($val2);
|
$this->fields[$key]['arrayofkeyval'][$key2]=$langs->trans($val2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1066,7 +1066,7 @@ class BOMLine extends CommonObject
|
|||||||
*/
|
*/
|
||||||
public function __construct(DoliDB $db)
|
public function __construct(DoliDB $db)
|
||||||
{
|
{
|
||||||
global $conf, $langs, $user;
|
global $conf, $langs;
|
||||||
|
|
||||||
$this->db = $db;
|
$this->db = $db;
|
||||||
|
|
||||||
@ -1085,11 +1085,11 @@ class BOMLine extends CommonObject
|
|||||||
// Translate some data of arrayofkeyval
|
// Translate some data of arrayofkeyval
|
||||||
foreach($this->fields as $key => $val)
|
foreach($this->fields as $key => $val)
|
||||||
{
|
{
|
||||||
if (is_array($this->fields['status']['arrayofkeyval']))
|
if (is_array($this->fields[$key]['arrayofkeyval']))
|
||||||
{
|
{
|
||||||
foreach($this->fields['status']['arrayofkeyval'] as $key2 => $val2)
|
foreach($this->fields[$key]['arrayofkeyval'] as $key2 => $val2)
|
||||||
{
|
{
|
||||||
$this->fields['status']['arrayofkeyval'][$key2]=$langs->trans($val2);
|
$this->fields[$key]['arrayofkeyval'][$key2]=$langs->trans($val2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -205,11 +205,11 @@ class EmailCollector extends CommonObject
|
|||||||
// Translate some data of arrayofkeyval
|
// Translate some data of arrayofkeyval
|
||||||
foreach($this->fields as $key => $val)
|
foreach($this->fields as $key => $val)
|
||||||
{
|
{
|
||||||
if (is_array($this->fields['status']['arrayofkeyval']))
|
if (is_array($this->fields[$key]['arrayofkeyval']))
|
||||||
{
|
{
|
||||||
foreach($this->fields['status']['arrayofkeyval'] as $key2 => $val2)
|
foreach($this->fields[$key]['arrayofkeyval'] as $key2 => $val2)
|
||||||
{
|
{
|
||||||
$this->fields['status']['arrayofkeyval'][$key2]=$langs->trans($val2);
|
$this->fields[$key]['arrayofkeyval'][$key2]=$langs->trans($val2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -145,7 +145,7 @@ class EmailCollectorAction extends CommonObject
|
|||||||
*/
|
*/
|
||||||
public function __construct(DoliDB $db)
|
public function __construct(DoliDB $db)
|
||||||
{
|
{
|
||||||
global $conf, $langs, $user;
|
global $conf, $langs;
|
||||||
|
|
||||||
$this->db = $db;
|
$this->db = $db;
|
||||||
|
|
||||||
@ -164,11 +164,11 @@ class EmailCollectorAction extends CommonObject
|
|||||||
// Translate some data of arrayofkeyval
|
// Translate some data of arrayofkeyval
|
||||||
foreach($this->fields as $key => $val)
|
foreach($this->fields as $key => $val)
|
||||||
{
|
{
|
||||||
if (is_array($this->fields['status']['arrayofkeyval']))
|
if (is_array($this->fields[$key]['arrayofkeyval']))
|
||||||
{
|
{
|
||||||
foreach($this->fields['status']['arrayofkeyval'] as $key2 => $val2)
|
foreach($this->fields[$key]['arrayofkeyval'] as $key2 => $val2)
|
||||||
{
|
{
|
||||||
$this->fields['status']['arrayofkeyval'][$key2]=$langs->trans($val2);
|
$this->fields[$key]['arrayofkeyval'][$key2]=$langs->trans($val2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -114,7 +114,7 @@ class EmailCollectorFilter extends CommonObject
|
|||||||
*/
|
*/
|
||||||
public function __construct(DoliDB $db)
|
public function __construct(DoliDB $db)
|
||||||
{
|
{
|
||||||
global $conf, $langs, $user;
|
global $conf, $langs;
|
||||||
|
|
||||||
$this->db = $db;
|
$this->db = $db;
|
||||||
|
|
||||||
@ -133,11 +133,11 @@ class EmailCollectorFilter extends CommonObject
|
|||||||
// Translate some data of arrayofkeyval
|
// Translate some data of arrayofkeyval
|
||||||
foreach($this->fields as $key => $val)
|
foreach($this->fields as $key => $val)
|
||||||
{
|
{
|
||||||
if (is_array($this->fields['status']['arrayofkeyval']))
|
if (is_array($this->fields[$key]['arrayofkeyval']))
|
||||||
{
|
{
|
||||||
foreach($this->fields['status']['arrayofkeyval'] as $key2 => $val2)
|
foreach($this->fields[$key]['arrayofkeyval'] as $key2 => $val2)
|
||||||
{
|
{
|
||||||
$this->fields['status']['arrayofkeyval'][$key2]=$langs->trans($val2);
|
$this->fields[$key]['arrayofkeyval'][$key2]=$langs->trans($val2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -227,11 +227,11 @@ class MyObject extends CommonObject
|
|||||||
// Translate some data of arrayofkeyval
|
// Translate some data of arrayofkeyval
|
||||||
foreach($this->fields as $key => $val)
|
foreach($this->fields as $key => $val)
|
||||||
{
|
{
|
||||||
if (is_array($this->fields['status']['arrayofkeyval']))
|
if (is_array($this->fields[$key]['arrayofkeyval']))
|
||||||
{
|
{
|
||||||
foreach($this->fields['status']['arrayofkeyval'] as $key2 => $val2)
|
foreach($this->fields[$key]['arrayofkeyval'] as $key2 => $val2)
|
||||||
{
|
{
|
||||||
$this->fields['status']['arrayofkeyval'][$key2]=$langs->trans($val2);
|
$this->fields[$key]['arrayofkeyval'][$key2]=$langs->trans($val2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user