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

Merge remote-tracking branch 'origin/3.5' into develop

Browse Source 
Conflicts:
	htdocs/compta/facture.php
This commit is contained in:
Laurent Destailleur 2013-11-21 02:31:04 +01:00
commit f6f4f425af
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/facture.php
View File

@ -3859,7 +3859,7 @@ else if ($id > 0 || ! empty($ref))
{
/*
* Affiche formulaire mail
*/
*/
// By default if $action=='presend'
$titreform='SendBillByMail';

7
htdocs/product/stock/fiche.php
View File

@ -268,8 +268,11 @@ else
// Country
print '<tr><td>'.$langs->trans('Country').'</td><td colspan="3">';
$img=picto_from_langcode($object->country_code);
print ($img?$img.' ':'');
if (! empty($object->country_code))
{
$img=picto_from_langcode($object->country_code);
print ($img?$img.' ':'');
}
print $object->country;
print '</td></tr>';