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

Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4

Browse Source
This commit is contained in:
Florian Henry 2013-11-21 12:29:03 +01:00
commit ea0bbb5896
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/compta/facture.php
View File

@ -3674,16 +3674,16 @@ else if ($id > 0 || ! empty($ref))
// 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';

5
htdocs/main.inc.php
View File

@ -1442,8 +1442,9 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
// Link to print main content area // Link to print main content area
if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->browser->phone)) if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->browser->phone))
{ {
$qs=$_SERVER["QUERY_STRING"].($_SERVER["QUERY_STRING"]?'&':'').$morequerystring; $qs=$_SERVER["QUERY_STRING"];
$text ='<a href="'.$_SERVER["PHP_SELF"].'?'.$qs.($qs?'&amp;':'').'optioncss=print" target="_blank">'; $qs.=(($qs && $morequerystring)?'&':'').$morequerystring;
$text ='<a href="'.$_SERVER["PHP_SELF"].'?'.$qs.($qs?'&':'').'optioncss=print" target="_blank">';
$text.= img_picto('', 'printer.png', 'class="printer"'); $text.= img_picto('', 'printer.png', 'class="printer"');
$text.='</a>'; $text.='</a>';
$toprightmenu.=$form->textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'',1); $toprightmenu.=$form->textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'',1);

4
htdocs/product/fiche.php
View File

@ -684,7 +684,7 @@ else
$tmpcode=''; $tmpcode='';
if (! empty($modCodeProduct->code_auto)) if (! empty($modCodeProduct->code_auto))
$tmpcode=$modCodeProduct->getNextValue($object,$type); $tmpcode=$modCodeProduct->getNextValue($object,$type);
print '<td class="fieldrequired" width="20%">'.$langs->trans("Ref").'</td><td><input name="ref" size="40" maxlength="32" value="'.dol_escape_htmltag(GETPOST('ref')?GETPOST('ref'):$tmpcode).'">'; print '<td class="fieldrequired" width="20%">'.$langs->trans("Ref").'</td><td><input name="ref" size="40" maxlength="128" value="'.dol_escape_htmltag(GETPOST('ref')?GETPOST('ref'):$tmpcode).'">';
if ($_error) if ($_error)
{ {
print $langs->trans("RefAlreadyExists"); print $langs->trans("RefAlreadyExists");
@ -862,7 +862,7 @@ else
print '<table class="border allwidth">'; print '<table class="border allwidth">';
// Ref // Ref
print '<tr><td width="15%" class="fieldrequired">'.$langs->trans("Ref").'</td><td colspan="2"><input name="ref" size="40" maxlength="32" value="'.$object->ref.'"></td></tr>'; print '<tr><td width="15%" class="fieldrequired">'.$langs->trans("Ref").'</td><td colspan="2"><input name="ref" size="40" maxlength="128" value="'.$object->ref.'"></td></tr>';
// Label // Label
print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td colspan="2"><input name="libelle" size="40" maxlength="255" value="'.$object->libelle.'"></td></tr>'; print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td colspan="2"><input name="libelle" size="40" maxlength="255" value="'.$object->libelle.'"></td></tr>';

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

@ -270,8 +270,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>';