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

Fix: Bad status report for contracts

Browse Source
This commit is contained in:
Laurent Destailleur 2008-07-12 10:31:58 +00:00
parent 987ede7c10
commit 6769a2b512
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
htdocs/comm/fiche.php
View File

@ -202,7 +202,7 @@ if ($socid > 0)
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
// Conditions de r<EFBFBD>glement par d<>faut // Conditions de reglement par defaut
$langs->load('bills'); $langs->load('bills');
$html = new Form($db); $html = new Form($db);
print '<tr><td nowrap>'; print '<tr><td nowrap>';
@ -223,7 +223,7 @@ if ($socid > 0)
print "</td>"; print "</td>";
print '</tr>'; print '</tr>';
// Mode de r<EFBFBD>glement // Mode de reglement
print '<tr><td nowrap>'; print '<tr><td nowrap>';
print '<table width="100%" class="nobordernopadding"><tr><td nowrap>'; print '<table width="100%" class="nobordernopadding"><tr><td nowrap>';
print $langs->trans('PaymentMode'); print $langs->trans('PaymentMode');
@ -242,7 +242,7 @@ if ($socid > 0)
print "</td>"; print "</td>";
print '</tr>'; print '</tr>';
// R<EFBFBD>ductions relative (Remises-Ristournes-Rabbais) // Reductions relative (Remises-Ristournes-Rabbais)
print '<tr><td nowrap>'; print '<tr><td nowrap>';
print '<table width="100%" class="nobordernopadding"><tr><td nowrap>'; print '<table width="100%" class="nobordernopadding"><tr><td nowrap>';
print $langs->trans("CustomerRelativeDiscountShort"); print $langs->trans("CustomerRelativeDiscountShort");
@ -255,7 +255,7 @@ if ($socid > 0)
print '</td><td colspan="3">'.($objsoc->remise_client?$objsoc->remise_client.'%':$langs->trans("DiscountNone")).'</td>'; print '</td><td colspan="3">'.($objsoc->remise_client?$objsoc->remise_client.'%':$langs->trans("DiscountNone")).'</td>';
print '</tr>'; print '</tr>';
// R<EFBFBD>ductions absolues (Remises-Ristournes-Rabbais) // Reductions absolues (Remises-Ristournes-Rabbais)
print '<tr><td nowrap>'; print '<tr><td nowrap>';
print '<table width="100%" class="nobordernopadding">'; print '<table width="100%" class="nobordernopadding">';
print '<tr><td nowrap>'; print '<tr><td nowrap>';
@ -275,7 +275,7 @@ if ($socid > 0)
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
// multiprix // Multiprix
if ($conf->global->PRODUIT_MULTIPRICES) if ($conf->global->PRODUIT_MULTIPRICES)
{ {
print '<tr><td nowrap>'; print '<tr><td nowrap>';
@ -332,7 +332,7 @@ if ($socid > 0)
print '<td valign="top" width="50%" class="notopnoleftnoright">'; print '<td valign="top" width="50%" class="notopnoleftnoright">';
// Nbre max d'<EFBFBD>l<EFBFBD>ments des petites listes // Nbre max d'elements des petites listes
$MAXLIST=4; $MAXLIST=4;
// Lien recap // Lien recap
@ -475,14 +475,22 @@ if ($socid > 0)
$i = 0; $i = 0;
while ($i < $num && $i < $MAXLIST) while ($i < $num && $i < $MAXLIST)
{ {
$contrat=new Contrat($db);
$objp = $db->fetch_object($resql); $objp = $db->fetch_object($resql);
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td><a href="'.DOL_URL_ROOT.'/contrat/fiche.php?id='.$objp->id.'">'.img_object($langs->trans("ShowContract"),"contract").' ' print '<td>';
.(!isset($objp->ref) ? $objp->id : $objp->ref) ."</a></td>\n"; $contrat->id=$objp->id;
$contrat->ref=$objp->ref;
print $contrat->getNomUrl(1);
print "</td>\n";
print '<td align="right" width="80">'.dolibarr_print_date($objp->dc)."</td>\n"; print '<td align="right" width="80">'.dolibarr_print_date($objp->dc)."</td>\n";
print '<td width="20">&nbsp;</td>'; print '<td width="20">&nbsp;</td>';
print '<td align="right" nowrap="nowrap">'.$contratstatic->LibStatut($objp->statut,5)."</td>\n"; print '<td align="right" nowrap="nowrap">';
$contrat->fetch_lignes();
print $contrat->getLibStatut(4);
print "</td>\n";
print '</tr>'; print '</tr>';
$i++; $i++;
} }

4
htdocs/contrat/contrat.class.php
View File

@ -979,8 +979,8 @@ class Contrat extends CommonObject
/** /**
* \brief Retourne le libelle du statut du contrat * \brief Retourne le libelle du statut du contrat
* \param mode 0=libell<EFBFBD> long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto * \param mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
* \return string Libell<EFBFBD> * \return string Label
*/ */
function getLibStatut($mode) function getLibStatut($mode)
{ {

3
htdocs/contrat/fiche.php
View File

@ -393,6 +393,9 @@ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes')
/*
* View
*/
llxHeader('',$langs->trans("ContractCard"),"Contrat"); llxHeader('',$langs->trans("ContractCard"),"Contrat");