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

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

Browse Source 
Conflicts:
	htdocs/don/class/don.class.php
	htdocs/product/stock/card.php
	htdocs/theme/eldy/style.css.php
This commit is contained in:
Laurent Destailleur 2019-03-04 16:29:16 +01:00
commit 27402f432a
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/don/class/don.class.php
View File

@ -687,7 +687,6 @@ class Don extends CommonObject
$this->societe = $obj->societe; $this->societe = $obj->societe;
$this->statut = $obj->fk_statut; $this->statut = $obj->fk_statut;
$this->address = $obj->address; $this->address = $obj->address;
$this->town = $obj->town;
$this->zip = $obj->zip; $this->zip = $obj->zip;
$this->town = $obj->town; $this->town = $obj->town;
$this->country_id = $obj->fk_country; $this->country_id = $obj->fk_country;

2
htdocs/product/stock/card.php
View File

@ -515,7 +515,7 @@ else
print '<td>'.$objp->produit.'</td>'; print '<td>'.$objp->produit.'</td>';
print '<td class="right">'; print '<td class="right">';
$valtoshow=price2num($objp->value, 'MS'); $valtoshow=price(price2num($objp->value, 'MS'), 0, '', 0, 0); // TODO replace with a qty() function
print empty($valtoshow)?'0':$valtoshow; print empty($valtoshow)?'0':$valtoshow;
print '</td>'; print '</td>';
$totalunit+=$objp->value; $totalunit+=$objp->value;

6
htdocs/theme/eldy/style.css.php
View File

@ -1839,6 +1839,12 @@ a.tmenuimage {
$found=1; $found=1;
break; break;
} }
else if (file_exists($dirroot."/".$val."/img/".$val.".png")) // Retro compatibilité
{
$url=dol_buildpath('/'.$val.'/img/'.$val.'.png', 1);
$found=1;
break;
}
} }
// Img file not found // Img file not found
if (! $found) if (! $found)

6
htdocs/theme/md/style.css.php
View File

@ -1819,6 +1819,12 @@ foreach($mainmenuusedarray as $val)
$found=1; $found=1;
break; break;
} }
else if (file_exists($dirroot."/".$val."/img/".$val.".png")) // Retro compatibilité
{
$url=dol_buildpath('/'.$val.'/img/'.$val.'.png', 1);
$found=1;
break;
}
} }
// Img file not found // Img file not found
if (! $found) if (! $found)