lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source 
Conflicts:
	htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
	htdocs/product/class/product.class.php
This commit is contained in:
Laurent Destailleur 2019-06-29 18:28:51 +02:00
commit b177787f0a
8 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/bom/class/bom.class.php
View File

@ -183,9 +183,9 @@ class BOM extends CommonObject
// Translate some data of arrayofkeyval
foreach($this->fields as $key => $val)
{
if (is_array($this->fields[$key]['arrayofkeyval']))
if (is_array($val['arrayofkeyval']))
{
foreach($this->fields[$key]['arrayofkeyval'] as $key2 => $val2)
foreach($val['arrayofkeyval'] as $key2 => $val2)
{
$this->fields[$key]['arrayofkeyval'][$key2]=$langs->trans($val2);
}
@ -1084,9 +1084,9 @@ class BOMLine extends CommonObject
// Translate some data of arrayofkeyval
foreach($this->fields as $key => $val)
{
if (is_array($this->fields[$key]['arrayofkeyval']))
if (is_array($val['arrayofkeyval']))
{
foreach($this->fields[$key]['arrayofkeyval'] as $key2 => $val2)
foreach($val['arrayofkeyval'] as $key2 => $val2)
{
$this->fields[$key]['arrayofkeyval'][$key2]=$langs->trans($val2);
}

4
htdocs/core/modules/bank/doc/pdf_ban.modules.php
View File

@ -303,7 +303,7 @@ class pdf_ban extends ModeleBankAccountDoc
* @param Translate $outputlangs Object lang for output
* @return void
*/
private function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
{
global $langs,$conf,$mysoc;
@ -389,7 +389,7 @@ class pdf_ban extends ModeleBankAccountDoc
* @param int $hidefreetext 1=Hide free text
* @return integer
*/
private function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
{
global $conf;
$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;

8
htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
View File

@ -448,7 +448,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
* @param Translate $outputlangs Langs object
* @return void
*/
private function _tableau_info(&$pdf, $object, $posy, $outputlangs)
protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
{
// phpcs:enable
global $conf, $mysoc;
@ -485,7 +485,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
* @param Translate $outputlangs Objet langs
* @return int Position pour suite
*/
private function _signature_area(&$pdf, $object, $posy, $outputlangs)
protected function _signature_area(&$pdf, $object, $posy, $outputlangs)
{
// phpcs:enable
$default_font_size = pdf_getPDFFontSize($outputlangs);
@ -526,7 +526,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
* @param Translate $outputlangs Object lang for output
* @return void
*/
private function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
{
global $langs,$conf,$mysoc;
@ -618,7 +618,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
* @param int $hidefreetext 1=Hide free text
* @return integer
*/
private function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
{
global $conf;
$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;

4
htdocs/emailcollector/class/emailcollector.class.php
View File

@ -209,9 +209,9 @@ class EmailCollector extends CommonObject
// Translate some data of arrayofkeyval
foreach($this->fields as $key => $val)
{
if (is_array($this->fields[$key]['arrayofkeyval']))
if (is_array($val['arrayofkeyval']))
{
foreach($this->fields[$key]['arrayofkeyval'] as $key2 => $val2)
foreach($val['arrayofkeyval'] as $key2 => $val2)
{
$this->fields[$key]['arrayofkeyval'][$key2]=$langs->trans($val2);
}

6
htdocs/emailcollector/class/emailcollectoraction.class.php
View File

@ -164,11 +164,11 @@ class EmailCollectorAction extends CommonObject
// Translate some data of arrayofkeyval
foreach($this->fields as $key => $val)
{
if (is_array($this->fields[$key]['arrayofkeyval']))
if (is_array($val['arrayofkeyval']))
{
foreach($this->fields[$key]['arrayofkeyval'] as $key2 => $val2)
foreach($val['arrayofkeyval'] as $key2 => $val2)
{
$this->fields[$key]['arrayofkeyval'][$key2]=$langs->trans($val2);
$this->fields[$key]['arrayofkeyval'][$key2]=$langs->trans($val2);
}
}
}

4
htdocs/emailcollector/class/emailcollectorfilter.class.php
View File

@ -133,9 +133,9 @@ class EmailCollectorFilter extends CommonObject
// Translate some data of arrayofkeyval
foreach($this->fields as $key => $val)
{
if (is_array($this->fields[$key]['arrayofkeyval']))
if (is_array($val['arrayofkeyval']))
{
foreach($this->fields[$key]['arrayofkeyval'] as $key2 => $val2)
foreach($val['arrayofkeyval'] as $key2 => $val2)
{
$this->fields[$key]['arrayofkeyval'][$key2]=$langs->trans($val2);
}

4
htdocs/modulebuilder/template/class/myobject.class.php
View File

@ -225,9 +225,9 @@ class MyObject extends CommonObject
// Translate some data of arrayofkeyval
foreach($this->fields as $key => $val)
{
if (is_array($this->fields[$key]['arrayofkeyval']))
if (is_array($val['arrayofkeyval']))
{
foreach($this->fields[$key]['arrayofkeyval'] as $key2 => $val2)
foreach($val['arrayofkeyval'] as $key2 => $val2)
{
$this->fields[$key]['arrayofkeyval'][$key2]=$langs->trans($val2);
}

8
htdocs/product/class/product.class.php
View File

@ -4084,7 +4084,11 @@ class Product extends CommonObject
}
$linkclose.= ' title="'.dol_escape_htmltag($label, 1, 1).'"';
$linkclose.= ' class="classfortooltip"';
$linkclose.= ' class="nowraponall classfortooltip"';
}
else
{
$linkclose = ' class="nowraponall"';
}
if ($option == 'supplier' || $option == 'category') {
@ -4106,7 +4110,7 @@ class Product extends CommonObject
}
}
$linkstart = '<a class="nowraponall" href="'.$url.'"';
$linkstart = '<a href="'.$url.'"';
$linkstart.=$linkclose.'>';
$linkend='</a>';