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

Ajout lien sur objet source sur page creation facture

Browse Source
This commit is contained in:
Laurent Destailleur 2006-05-31 23:05:29 +00:00
parent 71e9993766
commit 8f5c9618da
2 changed files with 48 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/compta/facture.php
View File

@ -877,7 +877,7 @@ if ($_GET['action'] == 'create')
// print '<input type="hidden" name="remise_percent" value="'.$propal->remise_percent.'">'."\n"; // print '<input type="hidden" name="remise_percent" value="'.$propal->remise_percent.'">'."\n";
print '<input type="hidden" name="propalid" value="'.$propal->id.'">'; print '<input type="hidden" name="propalid" value="'.$propal->id.'">';
print '<tr><td>'.$langs->trans('Proposal').'</td><td colspan="2">'.$propal->ref.'</td></tr>'; print '<tr><td>'.$langs->trans('Proposal').'</td><td colspan="2"><a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id.'">'.img_object($langs->trans("ShowPropal"),'propal').' '.$propal->ref.'</a></td></tr>';
print '<tr><td>'.$langs->trans('TotalHT').'</td><td colspan="2">'.price($propal->price).'</td></tr>'; print '<tr><td>'.$langs->trans('TotalHT').'</td><td colspan="2">'.price($propal->price).'</td></tr>';
print '<tr><td>'.$langs->trans('TotalVAT').'</td><td colspan="2">'.price($propal->total_tva)."</td></tr>"; print '<tr><td>'.$langs->trans('TotalVAT').'</td><td colspan="2">'.price($propal->total_tva)."</td></tr>";
print '<tr><td>'.$langs->trans('TotalTTC').'</td><td colspan="2">'.price($propal->total)."</td></tr>"; print '<tr><td>'.$langs->trans('TotalTTC').'</td><td colspan="2">'.price($propal->total)."</td></tr>";
@ -891,7 +891,7 @@ if ($_GET['action'] == 'create')
// print '<input type="hidden" name="remise_percent" value="'.$commande->remise_percent.'">'."\n"; // print '<input type="hidden" name="remise_percent" value="'.$commande->remise_percent.'">'."\n";
print '<input type="hidden" name="commandeid" value="'.$commande->id.'">'; print '<input type="hidden" name="commandeid" value="'.$commande->id.'">';
print '<tr><td>'.$langs->trans('Order').'</td><td colspan="2">'.$commande->ref.'</td></tr>'; print '<tr><td>'.$langs->trans('Order').'</td><td colspan="2"><a href="'.DOL_URL_ROOT.'/commande/fiche.php?id='.$commande->id.'">'.img_object($langs->trans("ShowOrder"),'order').' '.$commande->ref.'</a></td></tr>';
print '<tr><td>'.$langs->trans('TotalHT').'</td><td colspan="2">'.price($commande->total_ht).'</td></tr>'; print '<tr><td>'.$langs->trans('TotalHT').'</td><td colspan="2">'.price($commande->total_ht).'</td></tr>';
print '<tr><td>'.$langs->trans('TotalVAT').'</td><td colspan="2">'.price($commande->total_tva)."</td></tr>"; print '<tr><td>'.$langs->trans('TotalVAT').'</td><td colspan="2">'.price($commande->total_tva)."</td></tr>";
print '<tr><td>'.$langs->trans('TotalTTC').'</td><td colspan="2">'.price($commande->total_ttc)."</td></tr>"; print '<tr><td>'.$langs->trans('TotalTTC').'</td><td colspan="2">'.price($commande->total_ttc)."</td></tr>";
@ -910,7 +910,7 @@ if ($_GET['action'] == 'create')
// print '<input type="hidden" name="remise_percent" value="'.$contrat->remise_percent.'">'."\n"; // print '<input type="hidden" name="remise_percent" value="'.$contrat->remise_percent.'">'."\n";
print '<input type="hidden" name="contratid" value="'.$contrat->id.'">'; print '<input type="hidden" name="contratid" value="'.$contrat->id.'">';
print '<tr><td>'.$langs->trans('Contract').'</td><td colspan="2">'.$contrat->ref.'</td></tr>'; print '<tr><td>'.$langs->trans('Contract').'</td><td colspan="2"><a href="'.DOL_URL_ROOT.'/contrat/fiche.php?id='.$contrat->id.'">'.img_object($langs->trans("ShowContract"),'contract').' '.$contrat->ref.'</a></td></tr>';
print '<tr><td>'.$langs->trans('TotalHT').'</td><td colspan="2">'.price($contrat->total_ht).'</td></tr>'; print '<tr><td>'.$langs->trans('TotalHT').'</td><td colspan="2">'.price($contrat->total_ht).'</td></tr>';
print '<tr><td>'.$langs->trans('TotalVAT').'</td><td colspan="2">'.price($contrat->total_tva)."</td></tr>"; print '<tr><td>'.$langs->trans('TotalVAT').'</td><td colspan="2">'.price($contrat->total_tva)."</td></tr>";
print '<tr><td>'.$langs->trans('TotalTTC').'</td><td colspan="2">'.price($contrat->total_ttc)."</td></tr>"; print '<tr><td>'.$langs->trans('TotalTTC').'</td><td colspan="2">'.price($contrat->total_ttc)."</td></tr>";

88
htdocs/contrat/fiche.php
View File

@ -752,49 +752,51 @@ else
print "</tr>\n"; print "</tr>\n";
// Dates de en service prévues et effectives // Dates de en service prévues et effectives
if ($objp->subprice >= 0)
print '<tr '.$bc[$var].'>'; {
print '<td colspan="7">'; print '<tr '.$bc[$var].'>';
print '<td colspan="7">';
// Date prévues
print $langs->trans("DateStartPlanned").': '; // Date prévues
if ($objp->date_debut) { print $langs->trans("DateStartPlanned").': ';
print dolibarr_print_date($objp->date_debut); if ($objp->date_debut) {
// Warning si date prevu passée et pas en service print dolibarr_print_date($objp->date_debut);
if ($objp->statut == 0 && $objp->date_debut < time() - $conf->contrat->warning_delay) { print " ".img_warning($langs->trans("Late")); } // Warning si date prevu passée et pas en service
} if ($objp->statut == 0 && $objp->date_debut < time() - $conf->contrat->warning_delay) { print " ".img_warning($langs->trans("Late")); }
else print $langs->trans("Unknown"); }
print ' &nbsp;-&nbsp; '; else print $langs->trans("Unknown");
print $langs->trans("DateEndPlanned").': '; print ' &nbsp;-&nbsp; ';
if ($objp->date_fin) { print $langs->trans("DateEndPlanned").': ';
print dolibarr_print_date($objp->date_fin); if ($objp->date_fin) {
if ($objp->statut == 4 && $objp->date_fin < time() - $conf->contrat->warning_delay) { print " ".img_warning($langs->trans("Late")); } print dolibarr_print_date($objp->date_fin);
} if ($objp->statut == 4 && $objp->date_fin < time() - $conf->contrat->warning_delay) { print " ".img_warning($langs->trans("Late")); }
else print $langs->trans("Unknown"); }
else print $langs->trans("Unknown");
print '<br>';
print '<br>';
// Si pas encore activé
if (! $objp->date_debut_reelle) { // Si pas encore activé
print $langs->trans("DateStartReal").': '; if (! $objp->date_debut_reelle) {
if ($objp->date_debut_reelle) print dolibarr_print_date($objp->date_debut_reelle); print $langs->trans("DateStartReal").': ';
else print $langs->trans("ContractStatusNotRunning"); if ($objp->date_debut_reelle) print dolibarr_print_date($objp->date_debut_reelle);
} else print $langs->trans("ContractStatusNotRunning");
// Si activé et en cours }
if ($objp->date_debut_reelle && ! $objp->date_fin_reelle) { // Si activé et en cours
print $langs->trans("DateStartReal").': '; if ($objp->date_debut_reelle && ! $objp->date_fin_reelle) {
print dolibarr_print_date($objp->date_debut_reelle); print $langs->trans("DateStartReal").': ';
} print dolibarr_print_date($objp->date_debut_reelle);
// Si désactivé }
if ($objp->date_debut_reelle && $objp->date_fin_reelle) { // Si désactivé
print $langs->trans("DateStartReal").': '; if ($objp->date_debut_reelle && $objp->date_fin_reelle) {
print dolibarr_print_date($objp->date_debut_reelle); print $langs->trans("DateStartReal").': ';
print ' &nbsp;-&nbsp; '; print dolibarr_print_date($objp->date_debut_reelle);
print $langs->trans("DateEndReal").': '; print ' &nbsp;-&nbsp; ';
print dolibarr_print_date($objp->date_fin_reelle); print $langs->trans("DateEndReal").': ';
} print dolibarr_print_date($objp->date_fin_reelle);
print '</td>'; }
print '</tr>'; print '</td>';
print '</tr>';
}
} }
// Ligne en mode update // Ligne en mode update