Qual: Amliorations diverses mineures du module projet pour uniformiser l'interface
This commit is contained in:
Laurent Destailleur
parent
a51819961e
commit
df342b3b4b
@ -1,6 +1,6 @@
|
||||
<?php
|
||||
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -21,7 +21,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
/*! \file htdocs/projet/commandes.php
|
||||
/** \file htdocs/projet/commandes.php
|
||||
\ingroup projet commande
|
||||
\brief Page des commandes par projet
|
||||
\version $Revision$
|
||||
@ -34,6 +34,8 @@ require("../commande/commande.class.php");
|
||||
|
||||
$langs->load("projects");
|
||||
$langs->load("companies");
|
||||
$langs->load("orders");
|
||||
|
||||
|
||||
llxHeader("","../");
|
||||
|
||||
@ -67,18 +69,15 @@ if ($conf->facture->enabled) {
|
||||
$h++;
|
||||
}
|
||||
|
||||
dolibarr_fiche_head($head, $hselected);
|
||||
dolibarr_fiche_head($head, $hselected, $langs->trans("Project").": ".$projet->ref);
|
||||
|
||||
|
||||
/*
|
||||
*
|
||||
*
|
||||
*/
|
||||
$projet->societe->fetch($projet->societe->id);
|
||||
|
||||
print '<table class="border" width="100%">';
|
||||
print '<tr><td width="20%">'.$langs->trans("Title").'</td><td>'.$projet->title.'</td>';
|
||||
print '<td width="20%">'.$langs->trans("Ref").'</td><td>'.$projet->ref.'</td></tr>';
|
||||
print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3"><a href="../comm/fiche.php?socid='.$projet->societe->id.'">'.$projet->societe->nom.'</a></td></tr>';
|
||||
print '<tr><td>'.$langs->trans("Company").'</td><td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$projet->societe->id.'">'.$projet->societe->nom.'</a></td></tr>';
|
||||
print '<tr><td>'.$langs->trans("Ref").'</td><td>'.$projet->ref.'</td></tr>';
|
||||
print '<tr><td>'.$langs->trans("Label").'</td><td>'.$projet->title.'</td></tr>';
|
||||
print '</table><br>';
|
||||
|
||||
/*
|
||||
@ -90,7 +89,7 @@ $total = 0 ;
|
||||
if (sizeof($commandes)>0 && is_array($commandes))
|
||||
{
|
||||
print_titre('Listes des commandes associées au projet');
|
||||
print '<table border="0" width="100%">';
|
||||
print '<table class="noborder" width="100%">';
|
||||
|
||||
print '<tr class="liste_titre">';
|
||||
print '<td width="15%">'.$langs->trans("Ref").'</td><td width="25%">Date</td><td align="right">'.$langs->trans("Amount").'</td><td> </td></tr>';
|
||||
@ -109,9 +108,9 @@ if (sizeof($commandes)>0 && is_array($commandes))
|
||||
$total = $total + $commande->total_ht;
|
||||
}
|
||||
|
||||
print '<tr><td>'.$i.' commandes</td><td> </td>';
|
||||
print '<tr><td colspan="2">'.$i.' '.$langs->trans("Orders").'</td>';
|
||||
print '<td align="right">'.$langs->trans("TotalHT").': '.price($total).'</td>';
|
||||
print '<td align="right">'.$conf->monnaie.'</td></tr>';
|
||||
print '<td align="left">'.$conf->monnaie.'</td></tr>';
|
||||
print "</table>";
|
||||
}
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<?php
|
||||
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -21,7 +21,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
/*! \file htdocs/projet/facture.php
|
||||
/** \file htdocs/projet/facture.php
|
||||
\ingroup projet facture
|
||||
\brief Page des factures par projet
|
||||
\version $Revision$
|
||||
@ -34,6 +34,7 @@ require("../commande/commande.class.php");
|
||||
|
||||
$langs->load("projects");
|
||||
$langs->load("companies");
|
||||
$langs->load("bills");
|
||||
|
||||
|
||||
$user->getrights('projet');
|
||||
@ -73,18 +74,15 @@ if ($conf->facture->enabled) {
|
||||
$h++;
|
||||
}
|
||||
|
||||
dolibarr_fiche_head($head, $hselected);
|
||||
dolibarr_fiche_head($head, $hselected, $langs->trans("Project").": ".$projet->ref);
|
||||
|
||||
|
||||
/*
|
||||
*
|
||||
*
|
||||
*/
|
||||
$projet->societe->fetch($projet->societe->id);
|
||||
|
||||
print '<table class="border" width="100%">';
|
||||
print '<tr><td width="20%">'.$langs->trans("Title").'</td><td>'.$projet->title.'</td>';
|
||||
print '<td width="20%">'.$langs->trans("Ref").'</td><td>'.$projet->ref.'</td></tr>';
|
||||
print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3"><a href="../comm/fiche.php?socid='.$projet->societe->id.'">'.$projet->societe->nom.'</a></td></tr>';
|
||||
print '<tr><td>'.$langs->trans("Company").'</td><td><a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$projet->societe->id.'">'.$projet->societe->nom.'</a></td></tr>';
|
||||
print '<tr><td>'.$langs->trans("Ref").'</td><td>'.$projet->ref.'</td></tr>';
|
||||
print '<tr><td>'.$langs->trans("Label").'</td><td>'.$projet->title.'</td></tr>';
|
||||
print '</table><br>';
|
||||
|
||||
|
||||
@ -100,7 +98,7 @@ print '</table><br>';
|
||||
print '<table class="noborder" width="100%">';
|
||||
|
||||
print '<tr class="liste_titre">';
|
||||
print '<td width="15%">'.$langs->trans("Ref").'</td><td width="25%">Date</td><td align="right">Montant</td><td> </td></tr>';
|
||||
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>';
|
||||
|
||||
for ($i = 0; $i<sizeof($factures);$i++)
|
||||
{
|
||||
@ -116,9 +114,9 @@ print '</table><br>';
|
||||
$total = $total + $facture->total_ht;
|
||||
}
|
||||
|
||||
print '<tr><td>'.$i.' factures</td><td> </td>';
|
||||
print '<td align="right">'.$langs-<Trans("Total").' : '.price($total).'</td>';
|
||||
print '<td align="left">'.$conf->monnaie.' HT</td></tr>';
|
||||
print '<tr><td colspan="2">'.$i.' '.$langs->trans("Bills").'</td>';
|
||||
print '<td align="right">'.$langs->trans("TotalHT").' : '.price($total).'</td>';
|
||||
print '<td align="left">'.$conf->monnaie.'</td></tr>';
|
||||
print "</table>";
|
||||
}
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<?php
|
||||
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -21,7 +21,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
/*! \file htdocs/projet/fiche.php
|
||||
/** \file htdocs/projet/fiche.php
|
||||
\ingroup projet
|
||||
\brief Fiche projet
|
||||
\version $Revision$
|
||||
@ -60,13 +60,17 @@ if ($_POST["action"] == 'add' && $user->rights->projet->creer)
|
||||
|
||||
if ($_POST["action"] == 'update' && $user->rights->projet->creer)
|
||||
{
|
||||
$projet = new Project($db);
|
||||
$projet->id = $_POST["id"];
|
||||
$projet->ref = $_POST["ref"];
|
||||
$projet->title = $_POST["title"];
|
||||
$projet->update();
|
||||
|
||||
$_GET["id"]=$projet->id; // On retourne sur la fiche projet
|
||||
if (! $_POST["cancel"]) {
|
||||
$projet = new Project($db);
|
||||
$projet->id = $_POST["id"];
|
||||
$projet->ref = $_POST["ref"];
|
||||
$projet->title = $_POST["title"];
|
||||
$projet->update();
|
||||
|
||||
$_GET["id"]=$projet->id; // On retourne sur la fiche projet
|
||||
} else {
|
||||
$_GET["id"]=$_POST["id"]; // On retourne sur la fiche projet
|
||||
}
|
||||
}
|
||||
|
||||
if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == "yes")
|
||||
@ -80,19 +84,13 @@ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == "yes")
|
||||
llxHeader("",$langs->trans("Project"),"Projet");
|
||||
|
||||
|
||||
if ($_GET["action"] == 'delete')
|
||||
{
|
||||
$htmls = new Form($db);
|
||||
$htmls->form_confirm("fiche.php?id=$id","Supprimer un projet","Etes-vous sur de vouloir supprimer cet projet ?","confirm_delete");
|
||||
}
|
||||
|
||||
if ($_GET["action"] == 'create' && $user->rights->projet->creer)
|
||||
{
|
||||
print_titre($langs->trans("NewProject"));
|
||||
|
||||
print '<form action="fiche.php?socidp='.$_GET["socidp"].'" method="post">';
|
||||
|
||||
print '<table class="border">';
|
||||
print '<table class="border" width="100%">';
|
||||
print '<input type="hidden" name="action" value="add">';
|
||||
print '<tr><td>'.$langs->trans("Company").'</td><td>';
|
||||
|
||||
@ -105,12 +103,13 @@ if ($_GET["action"] == 'create' && $user->rights->projet->creer)
|
||||
print '<tr><td>'.$langs->trans("Author").'</td><td>'.$user->fullname.'</td></tr>';
|
||||
|
||||
print '<tr><td>'.$langs->trans("Ref").'</td><td><input size="10" type="text" name="ref"></td></tr>';
|
||||
print '<tr><td>'.$langs->trans("Title").'</td><td><input size="30" type="text" name="title"></td></tr>';
|
||||
print '<tr><td colspan="2"><input type="submit" value="'.$langs->trans("Save").'"></td></tr>';
|
||||
print '<tr><td>'.$langs->trans("Label").'</td><td><input size="30" type="text" name="title"></td></tr>';
|
||||
print '<tr><td colspan="2" align="center"><input type="submit" value="'.$langs->trans("Create").'"></td></tr>';
|
||||
print '</table>';
|
||||
print '</form>';
|
||||
|
||||
} else {
|
||||
|
||||
/*
|
||||
* Fiche projet en mode visu
|
||||
*
|
||||
@ -147,7 +146,15 @@ if ($_GET["action"] == 'create' && $user->rights->projet->creer)
|
||||
$h++;
|
||||
}
|
||||
|
||||
dolibarr_fiche_head($head, $hselected);
|
||||
dolibarr_fiche_head($head, $hselected, $langs->trans("Project").": ".$projet->ref);
|
||||
|
||||
|
||||
if ($_GET["action"] == 'delete')
|
||||
{
|
||||
$htmls = new Form($db);
|
||||
$htmls->form_confirm("fiche.php?id=".$_GET["id"],$langs->trans("DeleteAProject"),$langs->trans("ConfirmDeleteAProject"),"confirm_delete");
|
||||
print "<br>";
|
||||
}
|
||||
|
||||
if ($_GET["action"] == 'edit')
|
||||
{
|
||||
@ -156,19 +163,20 @@ if ($_GET["action"] == 'create' && $user->rights->projet->creer)
|
||||
print '<input type="hidden" name="id" value="'.$_GET["id"].'">';
|
||||
|
||||
print '<table class="border" width="50%">';
|
||||
print '<tr><td>'.$langs->trans("Company").'</td><td>'.$projet->societe->nom.'</td></tr>';
|
||||
print '<tr><td>'.$langs->trans("Title").'</td><td><input name="title" value="'.$projet->title.'"></td></tr>';
|
||||
print '<tr><td>'.$langs->trans("Company").'</td><td><a href="'.DOL_URL_ROOT.'/soc.php?socid='.$projet->societe->id.'">'.$projet->societe->nom.'</td></tr>';
|
||||
print '<tr><td>'.$langs->trans("Ref").'</td><td><input name="ref" value="'.$projet->ref.'"></td></tr>';
|
||||
print '<tr><td>'.$langs->trans("Label").'</td><td><input name="title" value="'.$projet->title.'"></td></tr>';
|
||||
print '<tr><td align="center" colspan="2"><input name="update" type="submit" Value="'.$langs->trans("Modify").'"> <input type="submit" name="cancel" Value="'.$langs->trans("Cancel").'"></td></tr>';
|
||||
print '</table>';
|
||||
print '<p><input type="submit" Value="'.$langs->trans("Modify").'"></p>';
|
||||
print '<br>';
|
||||
print '</form>';
|
||||
}
|
||||
else
|
||||
{
|
||||
print '<table class="border" width="100%">';
|
||||
print '<tr><td width="20%">'.$langs->trans("Title").'</td><td>'.$projet->title.'</td>';
|
||||
print '<td width="20%">'.$langs->trans("Ref").'</td><td>'.$projet->ref.'</td></tr>';
|
||||
print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">'.$projet->societe->nom_url.'</a></td></tr>';
|
||||
print '<tr><td>'.$langs->trans("Company").'</td><td><a href="'.DOL_URL_ROOT.'/soc.php?socid='.$projet->societe->id.'">'.$projet->societe->nom.'</a></td></tr>';
|
||||
print '<tr><td>'.$langs->trans("Ref").'</td><td>'.$projet->ref.'</td></tr>';
|
||||
print '<tr><td>'.$langs->trans("Label").'</td><td>'.$projet->title.'</td></tr>';
|
||||
print '</table>';
|
||||
print '<br>';
|
||||
}
|
||||
@ -182,17 +190,13 @@ if ($_GET["action"] == 'create' && $user->rights->projet->creer)
|
||||
if ($user->rights->projet->creer == 1)
|
||||
{
|
||||
print '<div class="tabsAction">';
|
||||
if ($_GET["action"] == "edit")
|
||||
{
|
||||
print '<a class="tabAction" href="fiche.php?id='.$projet->id.'">'.$langs->trans("Cancel").'</a>';
|
||||
}
|
||||
else
|
||||
|
||||
if ($_GET["action"] != "edit")
|
||||
{
|
||||
print '<a class="tabAction" href="fiche.php?id='.$projet->id.'&action=edit">'.$langs->trans("Edit").'</a>';
|
||||
print '<a class="butDelete" href="fiche.php?id='.$projet->id.'&action=delete">'.$langs->trans("Delete").'</a>';
|
||||
}
|
||||
|
||||
print '<a class="tabAction" href="fiche.php?id='.$projet->id.'&action=delete">'.$langs->trans("Delete").'</a>';
|
||||
|
||||
|
||||
print "</div>";
|
||||
}
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<?php
|
||||
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -21,8 +21,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
/*!
|
||||
\file htdocs/projet/index.php
|
||||
/** \file htdocs/projet/index.php
|
||||
\ingroup projet
|
||||
\brief Page d'accueil du module projet
|
||||
\version $Revision$
|
||||
@ -50,7 +49,7 @@ $sortorder = isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"];
|
||||
$page=isset($_GET["page"])?$_GET["page"]:$_POST["page"];
|
||||
if ($sortfield == "")
|
||||
{
|
||||
$sortfield="lower(s.nom)";
|
||||
$sortfield="p.ref";
|
||||
}
|
||||
if ($sortorder == "")
|
||||
{
|
||||
@ -72,8 +71,8 @@ $pagenext = $page + 1;
|
||||
print '<br>';
|
||||
print '<table class="noborder" width="100%">';
|
||||
print '<tr class="liste_titre">';
|
||||
print_liste_field_titre($langs->trans("Ref"),"index.php","s.idp","","","",$sortfield);
|
||||
print_liste_field_titre($langs->trans("Title"),"index.php","p.title","","","",$sortfield);
|
||||
print_liste_field_titre($langs->trans("Ref"),"index.php","p.ref","","","",$sortfield);
|
||||
print_liste_field_titre($langs->trans("Label"),"index.php","p.title","","","",$sortfield);
|
||||
print_liste_field_titre($langs->trans("Company"),"index.php","s.nom","","","",$sortfield);
|
||||
print "</tr>\n";
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<?php
|
||||
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -21,7 +21,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
/*! \file htdocs/projet/propal.php
|
||||
/** \file htdocs/projet/propal.php
|
||||
\ingroup projet propale
|
||||
\brief Page des propositions commerciales par projet
|
||||
\version $Revision$
|
||||
@ -34,6 +34,8 @@ require("../commande/commande.class.php");
|
||||
|
||||
$langs->load("projects");
|
||||
$langs->load("companies");
|
||||
$langs->load("propal");
|
||||
|
||||
|
||||
llxHeader("","../");
|
||||
|
||||
@ -67,19 +69,17 @@ if ($conf->facture->enabled) {
|
||||
$h++;
|
||||
}
|
||||
|
||||
dolibarr_fiche_head($head, $hselected);
|
||||
dolibarr_fiche_head($head, $hselected, $langs->trans("Project").": ".$projet->ref);
|
||||
|
||||
|
||||
/*
|
||||
*
|
||||
*/
|
||||
$propales = array();
|
||||
|
||||
$projet->societe->fetch($projet->societe->id);
|
||||
|
||||
print '<table class="border" width="100%">';
|
||||
print '<tr><td width="20%">'.$langs->trans("Title").'</td><td>'.$projet->title.'</td>';
|
||||
print '<td width="20%">'.$langs->trans("Ref").'</td><td>'.$projet->ref.'</td></tr>';
|
||||
print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3"><a href="../comm/fiche.php?socid='.$projet->societe->id.'">'.$projet->societe->nom.'</a></td></tr>';
|
||||
print '<tr><td>'.$langs->trans("Company").'</td><td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$projet->societe->id.'">'.$projet->societe->nom.'</a></td></tr>';
|
||||
print '<tr><td>'.$langs->trans("Ref").'</td><td>'.$projet->ref.'</td></tr>';
|
||||
print '<tr><td>'.$langs->trans("Label").'</td><td>'.$projet->title.'</td></tr>';
|
||||
print '</table><br>';
|
||||
|
||||
$propales = $projet->get_propal_list();
|
||||
@ -107,9 +107,9 @@ if (sizeof($propales)>0 && is_array($propales))
|
||||
$total = $total + $propale->price;
|
||||
}
|
||||
|
||||
print '<tr><td>'.$i.' propales</td><td> </td>';
|
||||
print '<td align="right">Total : '.price($total).'</td>';
|
||||
print '<td align="left">'.$conf->monnaie.' HT</td></tr></table>';
|
||||
print '<tr><td colspan="2">'.$i.' '.$langs->trans("Proposal").'</td>';
|
||||
print '<td align="right">'.$langs->trans("TotalHT").': '.price($total).'</td>';
|
||||
print '<td align="left">'.$conf->monnaie.'</td></tr></table>';
|
||||
}
|
||||
|
||||
$db->close();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user