Fix: Support option mysql strict for orders creation
New: Add a tab referers in project card. Qual: Mutualize all code for project referers view
This commit is contained in:
parent
5e4f47a8d7
commit
1c3e137547
@ -856,11 +856,12 @@ if ($_GET['action'] == 'create' && $user->rights->commande->creer)
|
||||
// Projet
|
||||
if ($conf->projet->enabled)
|
||||
{
|
||||
$projetid=$_POST["projetid"]?$_POST["projetid"]:$commande->projetid;
|
||||
print '<tr><td>'.$langs->trans('Project').'</td><td colspan="2">';
|
||||
$numprojet=select_projects($soc->id,$projetid,'projetid');
|
||||
if ($numprojet==0)
|
||||
{
|
||||
print ' <a href=../projet/fiche.php?socid='.$soc->id.'&action=create>'.$langs->trans("AddProject").'</a>';
|
||||
print ' <a href="'.DOL_URL_ROOT.'/projet/fiche.php?socid='.$soc->id.'&action=create">'.$langs->trans("AddProject").'</a>';
|
||||
}
|
||||
print '</td></tr>';
|
||||
}
|
||||
|
||||
@ -116,7 +116,10 @@ foreach ($listofreferent as $key => $value)
|
||||
print '<table class="noborder" width="100%">';
|
||||
|
||||
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> </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);
|
||||
if (sizeof($elementarray)>0 && is_array($elementarray))
|
||||
{
|
||||
@ -135,14 +138,15 @@ foreach ($listofreferent as $key => $value)
|
||||
$date=$element->date;
|
||||
if (empty($date)) $date=$element->datep;
|
||||
print '<td>'.dolibarr_print_date($date,'day').'</td>';
|
||||
print '<td align="right">'.price($element->total_ht).'</td><td> </td></tr>';
|
||||
print '<td align="right">'.price($element->total_ht).'</td>';
|
||||
print '</tr>';
|
||||
|
||||
$total = $total + $element->total_ht;
|
||||
}
|
||||
|
||||
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="left">'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
|
||||
print '<td align="right" width="100">'.$langs->trans("TotalHT").' : '.price($total).'</td>';
|
||||
print '</tr>';
|
||||
}
|
||||
print "</table>";
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user