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

Fix: Support option mysql strict for orders creation

Browse Source 
New: Add a tab referers in project card.
Qual: Mutualize all code for project referers view
This commit is contained in:
Laurent Destailleur 2008-04-19 17:34:24 +00:00
parent 5e4f47a8d7
commit 1c3e137547
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/commande/fiche.php
View File

@ -856,11 +856,12 @@ if ($_GET['action'] == 'create' && $user->rights->commande->creer)
// Projet // Projet
if ($conf->projet->enabled) if ($conf->projet->enabled)
{ {
$projetid=$_POST["projetid"]?$_POST["projetid"]:$commande->projetid;
print '<tr><td>'.$langs->trans('Project').'</td><td colspan="2">'; print '<tr><td>'.$langs->trans('Project').'</td><td colspan="2">';
$numprojet=select_projects($soc->id,$projetid,'projetid'); $numprojet=select_projects($soc->id,$projetid,'projetid');
if ($numprojet==0) if ($numprojet==0)
{ {
print ' &nbsp; <a href=../projet/fiche.php?socid='.$soc->id.'&action=create>'.$langs->trans("AddProject").'</a>'; print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/fiche.php?socid='.$soc->id.'&action=create">'.$langs->trans("AddProject").'</a>';
} }
print '</td></tr>'; print '</td></tr>';
} }

12
htdocs/projet/element.php
View File

@ -116,7 +116,10 @@ foreach ($listofreferent as $key => $value)
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td width="15%">'.$langs->trans("Ref").'</td><td width="25%">'.$langs->trans("Date").'</td><td align="right">'.$langs->trans("Amount").'</td><td>&nbsp;</td></tr>'; print '<td width="150">'.$langs->trans("Ref").'</td>';
print '<td>'.$langs->trans("Date").'</td>';
print '<td align="right">'.$langs->trans("Amount").'</td>';
print '</tr>';
$elementarray = $projet->get_element_list($key); $elementarray = $projet->get_element_list($key);
if (sizeof($elementarray)>0 && is_array($elementarray)) if (sizeof($elementarray)>0 && is_array($elementarray))
{ {
@ -135,14 +138,15 @@ foreach ($listofreferent as $key => $value)
$date=$element->date; $date=$element->date;
if (empty($date)) $date=$element->datep; if (empty($date)) $date=$element->datep;
print '<td>'.dolibarr_print_date($date,'day').'</td>'; print '<td>'.dolibarr_print_date($date,'day').'</td>';
print '<td align="right">'.price($element->total_ht).'</td><td>&nbsp;</td></tr>'; print '<td align="right">'.price($element->total_ht).'</td>';
print '</tr>';
$total = $total + $element->total_ht; $total = $total + $element->total_ht;
} }
print '<tr class="liste_total"><td colspan="2">'.$i.' '.$langs->trans("Bills").'</td>'; print '<tr class="liste_total"><td colspan="2">'.$i.' '.$langs->trans("Bills").'</td>';
print '<td align="right">'.$langs->trans("TotalHT").' : '.price($total).'</td>'; print '<td align="right" width="100">'.$langs->trans("TotalHT").' : '.price($total).'</td>';
print '<td align="left">'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; print '</tr>';
} }
print "</table>"; print "</table>";