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

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

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

8
htdocs/compta/facture.php
View File

@ -3859,22 +3859,22 @@ else if ($id > 0 || ! empty($ref))
{ {
/* /*
* Affiche formulaire mail * Affiche formulaire mail
*/ */
// By default if $action=='presend' // By default if $action=='presend'
$titreform='SendBillByMail'; $titreform='SendBillByMail';
$topicmail='SendBillRef'; $topicmail='SendBillRef';
$action='send';
$modelmail='facture_send'; $modelmail='facture_send';
if ($action == 'prerelance') // For backward compatibility if ($action == 'prerelance') // For backward compatibility
{ {
$titrefrom='SendReminderBillByMail'; $titrefrom='SendReminderBillByMail';
$topicmail='SendReminderBillRef'; $topicmail='SendReminderBillRef';
$action='relance';
$modelmail='facture_relance'; $modelmail='facture_relance';
$action='relance';
} }
else $action='send';
$ref = dol_sanitizeFileName($object->ref); $ref = dol_sanitizeFileName($object->ref);
include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
$fileparams = dol_most_recent_file($conf->facture->dir_output . '/' . $ref, preg_quote($ref,'/')); $fileparams = dol_most_recent_file($conf->facture->dir_output . '/' . $ref, preg_quote($ref,'/'));

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

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