diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index cc4be6ba5b1cd2d1d40aa24cb7ed2708e73a2f1b..e1beb363b1efdb5b63d37119ddc6808753e0dd09 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -165,7 +165,7 @@ if ($_REQUEST['action'] == 'confirm_deleteline' && $_REQUEST['confirm'] == 'yes' $outputlangs->setDefaultLang($newlang); } propale_pdf_create($db, $propal, $propal->modelpdf, $outputlangs); - + Header ('Location: '.$_SERVER["PHP_SELF"].'?id='.$propal->id); exit; } @@ -1008,7 +1008,7 @@ if ($id > 0 || ! empty($ref)) $ret=$html->form_confirm($_SERVER["PHP_SELF"].'?id='.$propal->id.'&lineid='.$_GET["lineid"], $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline','',0,1); if ($ret == 'html') print '<br>'; } - + /* * TODO ajout temporaire pour test en attendant la migration en template */ @@ -1372,12 +1372,14 @@ if ($id > 0 || ! empty($ref)) print '<script> jQuery(document).ready(function(){ jQuery("#objectline").tableDnD(); - }); + jQuery(".imgup").hide(); + jQuery(".imgdown").hide(); + }); </script>'; } - + print '<table id="objectline" class="noborder" width="100%">'; - + $result = $propal->getLinesArray(); if (!empty($propal->lines)) @@ -1484,7 +1486,7 @@ if ($id > 0 || ! empty($ref)) print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$propal->id.'&action=presend&mode=init">'.$langs->trans('SendByMail').'</a>'; } } - + // Create an invoice and classify billed if ($conf->facture->enabled && $propal->statut == 2 && $user->societe_id == 0) { @@ -1492,7 +1494,7 @@ if ($id > 0 || ! empty($ref)) { print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&origin='.$propal->element.'&originid='.$propal->id.'&socid='.$propal->socid.'">'.$langs->trans("BuildBill").'</a>'; } - + $arraypropal=$propal->getInvoiceArrayList(); if (is_array($arraypropal) && sizeof($arraypropal) > 0) { diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php index 5022278c74eeae1d71dc2b8f89fe39af901c6d98..164f09e91b5a5dbcea0702b57229a4dbd5b2d85b 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.php @@ -1397,31 +1397,31 @@ function img_previous($alt = "default") } /** - * \brief Affiche logo bas - * \param alt Texte sur le alt de l'image - * \param selected Affiche version "selected" du logo - * \return string Retourne tag img + * Show logo down arrow + * @param alt Texte sur le alt de l'image + * @param selected Affiche version "selected" du logo + * @return string Retourne tag img */ function img_down($alt = "default", $selected=0) { global $conf,$langs; if ($alt=="default") $alt=$langs->trans("Down"); - if ($selected) return '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/1downarrow_selected.png" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'">'; - else return '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/1downarrow.png" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'">'; + if ($selected) return '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/1downarrow_selected.png" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'" class="imgdown">'; + else return '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/1downarrow.png" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'" class="imgdown">'; } /** - * \brief Affiche logo haut - * \param alt Texte sur le alt de l'image - * \param selected Affiche version "selected" du logo - * \return string Retourne tag img + * Show logo top arrow + * @param alt Texte sur le alt de l'image + * @param selected Affiche version "selected" du logo + * @return string Retourne tag img */ function img_up($alt = "default", $selected=0) { global $conf,$langs; if ($alt=="default") $alt=$langs->trans("Up"); - if ($selected) return '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/1uparrow_selected.png" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'">'; - else return '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/1uparrow.png" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'">'; + if ($selected) return '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/1uparrow_selected.png" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'" class="imgup">'; + else return '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/1uparrow.png" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'" class="imgup">'; } /**