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

Fix: suppression du bouton de modification de la remise fixe + modification esthtique mineure

Browse Source
This commit is contained in:
Regis Houssin 2007-04-02 23:47:54 +00:00
parent 37cec358cb
commit f265a205be
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/compta/facture/apercu.php
View File

@ -109,6 +109,7 @@ if ($_GET["facid"] > 0)
// Remise globale // Remise globale
print '<tr><td>'.$langs->trans('GlobalDiscount').'</td>'; print '<tr><td>'.$langs->trans('GlobalDiscount').'</td>';
/*
if ($fac->brouillon == 1 && $user->rights->facture->creer) if ($fac->brouillon == 1 && $user->rights->facture->creer)
{ {
print '<form action="facture.php?facid='.$fac->id.'" method="post">'; print '<form action="facture.php?facid='.$fac->id.'" method="post">';
@ -119,12 +120,14 @@ if ($_GET["facid"] > 0)
} }
else else
{ {
*/
print '<td colspan="3">'.$fac->remise_percent.'%</td>'; print '<td colspan="3">'.$fac->remise_percent.'%</td>';
} // }
$nbrows=5; $nbrows=5;
if ($conf->global->FAC_USE_CUSTOMER_ORDER_REF) $nbrows++; if ($conf->global->FAC_USE_CUSTOMER_ORDER_REF) $nbrows++;
print '<td rowspan="'.$nbrows.'" colspan="2" valign="top">'; if ($conf->projet->enabled) $nbrows++;
print '<td rowspan="'.$nbrows.'" colspan="2" valign="top">';
/* /*
* Documents * Documents
@ -199,9 +202,9 @@ if ($_GET["facid"] > 0)
imagick_writeimages( $handle, $file .".png"); imagick_writeimages( $handle, $file .".png");
} }
else else
{ {
$langs->load("other"); $langs->load("other");
print '<font class="error">'.$langs->trans("ErrorNoImagickReadimage").'</font>'; print '<font class="error">'.$langs->trans("ErrorNoImagickReadimage").'</font>';
} }
} }