Skip to content

Commit

Permalink
Qual: Factorisation du code de gestion des onglets pour les propales
Browse files Browse the repository at this point in the history
  • Loading branch information
@eldy
eldy committed Jun 3, 2006
1 parent 490e293 commit 59a18bb
Show file tree
Hide file tree
Showing 10 changed files with 847 additions and 975 deletions.
1,472 changes: 718 additions & 754 deletions htdocs/comm/propal.php
View file

Large diffs are not rendered by default.

70 changes: 17 additions & 53 deletions htdocs/comm/propal/apercu.php
View file
Expand Up @@ -30,6 +30,12 @@
*/

require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT.'/propal.class.php');
require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
if ($conf->projet->enabled) {
require_once(DOL_DOCUMENT_ROOT."/project.class.php");
}


$user->getrights('propale');

Expand All @@ -40,22 +46,15 @@
$langs->load("bills");
$langs->load('compta');


require_once(DOL_DOCUMENT_ROOT.'/propal.class.php');
if ($conf->projet->enabled) {
require_once(DOL_DOCUMENT_ROOT."/project.class.php");
}


/*
* Sécurité accés client
*/
// Sécurité accés client
if ($user->societe_id > 0)
{
$action = '';
$socidp = $user->societe_id;
}



llxHeader();

$html = new Form($db);
Expand All @@ -66,45 +65,17 @@
/* */
/* *************************************************************************** */

if ($_GET["propalid"] > 0) {
if ($_GET["propalid"] > 0)
{
$propal = new Propal($db);

if ( $propal->fetch($_GET["propalid"], $user->societe_id) > 0)
{
{
$soc = new Societe($db, $propal->socidp);
$soc->fetch($propal->socidp);

$h=0;

$head[$h][0] = DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id;
$head[$h][1] = $langs->trans('CommercialCard');
$h++;

$head[$h][0] = DOL_URL_ROOT.'/compta/propal.php?propalid='.$propal->id;
$head[$h][1] = $langs->trans('AccountancyCard');
$h++;

if ($conf->use_preview_tabs)
{
$head[$h][0] = DOL_URL_ROOT.'/comm/propal/apercu.php?propalid='.$propal->id;
$head[$h][1] = $langs->trans("Preview");
$hselected=$h;
$h++;
}

$head[$h][0] = DOL_URL_ROOT.'/comm/propal/note.php?propalid='.$propal->id;
$head[$h][1] = $langs->trans('Note');
$h++;

$head[$h][0] = DOL_URL_ROOT.'/comm/propal/info.php?propalid='.$propal->id;
$head[$h][1] = $langs->trans('Info');
$h++;

$head[$h][0] = DOL_URL_ROOT.'/comm/propal/document.php?propalid='.$propal->id;
$head[$h][1] = $langs->trans('Documents');
$h++;

dolibarr_fiche_head($head, $hselected, $langs->trans('Proposal'));
$head = propal_prepare_head($propal);
dolibarr_fiche_head($head, 'preview', $langs->trans('Proposal'));


/*
Expand All @@ -131,18 +102,11 @@
print '<tr><td width="30%">'.$langs->trans('Ref').'</td><td colspan="5">'.$propal->ref_url.'</td></tr>';

$rowspan=3;

// ligne 1
// partie Gauche
print '<tr><td>'.$langs->trans('Company').'</td><td colspan="3">';
if ($societe->client == 1)
{
$url = DOL_URL_ROOT.'/comm/fiche.php?socid='.$societe->id;
}
else
{
$url = DOL_URL_ROOT.'/comm/prospect/fiche.php?socid='.$societe->id;
}
print '<a href="'.$url.'">'.$societe->nom.'</a></td>';
print '<tr><td>'.$langs->trans('Company').'</td><td colspan="3">'.$societe->getNomUrl(1).'</td>';

// partie Droite
print '<td align="left">'.$langs->trans("PaymentConditions").'</td>';
print '<td>'.'&nbsp;'.'</td>';
Expand Down
46 changes: 4 additions & 42 deletions htdocs/comm/propal/document.php
View file
Expand Up @@ -31,6 +31,7 @@

require('./pre.inc.php');
require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");

$user->getrights('propale');

Expand Down Expand Up @@ -110,37 +111,8 @@
$societe = new Societe($db);
$societe->fetch($propal->socidp);

$h=0;

$head[$h][0] = DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id;
$head[$h][1] = $langs->trans('CommercialCard');
$h++;

$head[$h][0] = DOL_URL_ROOT.'/compta/propal.php?propalid='.$propal->id;
$head[$h][1] = $langs->trans('AccountancyCard');
$h++;

if ($conf->use_preview_tabs)
{
$head[$h][0] = DOL_URL_ROOT.'/comm/propal/apercu.php?propalid='.$propal->id;
$head[$h][1] = $langs->trans("Preview");
$h++;
}

$head[$h][0] = DOL_URL_ROOT.'/comm/propal/note.php?propalid='.$propal->id;
$head[$h][1] = $langs->trans('Note');
$h++;

$head[$h][0] = DOL_URL_ROOT.'/comm/propal/info.php?propalid='.$propal->id;
$head[$h][1] = $langs->trans('Info');
$h++;

$head[$h][0] = DOL_URL_ROOT.'/comm/propal/document.php?propalid='.$propal->id;
$head[$h][1] = $langs->trans('Documents');
$hselected=$h;
$h++;

dolibarr_fiche_head($head, $hselected, $langs->trans('Proposal'));
$head = propal_prepare_head($propal);
dolibarr_fiche_head($head, 'document', $langs->trans('Proposal'));

// Construit liste des fichiers
clearstatcache();
Expand Down Expand Up @@ -178,17 +150,7 @@
print '<tr><td width="30%">'.$langs->trans('Ref').'</td><td colspan="3">'.$propal->ref_url.'</td></tr>';

// Société
print '<tr><td>'.$langs->trans('Company').'</td><td colspan="5">';
if ($societe->client == 1)
{
$url ='fiche.php?socid='.$societe->id;
}
else
{
$url = DOL_URL_ROOT.'/comm/prospect/fiche.php?socid='.$societe->id;
}
print '<a href="'.$url.'">'.$societe->nom.'</a></td>';
print '</tr>';
print '<tr><td>'.$langs->trans('Company').'</td><td colspan="5">'.$societe->getNomUrl(1).'</td></tr>';

print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.sizeof($filearray).'</td></tr>';
print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
Expand Down
33 changes: 3 additions & 30 deletions htdocs/comm/propal/info.php
View file
Expand Up @@ -30,6 +30,7 @@

require('./pre.inc.php');
require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");

$langs->load('propal');
$langs->load('compta');
Expand All @@ -56,37 +57,9 @@

$societe = new Societe($db);
$societe->fetch($propal->soc_id);
$h=0;

$head[$h][0] = DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id;
$head[$h][1] = $langs->trans('CommercialCard');
$h++;

$head[$h][0] = DOL_URL_ROOT.'/compta/propal.php?propalid='.$propal->id;
$head[$h][1] = $langs->trans('AccountancyCard');
$h++;

if ($conf->use_preview_tabs)
{
$head[$h][0] = DOL_URL_ROOT.'/comm/propal/apercu.php?propalid='.$propal->id;
$head[$h][1] = $langs->trans("Preview");
$h++;
}

$head[$h][0] = DOL_URL_ROOT.'/comm/propal/note.php?propalid='.$propal->id;
$head[$h][1] = $langs->trans('Note');
$h++;

$head[$h][0] = DOL_URL_ROOT.'/comm/propal/info.php?propalid='.$propal->id;
$head[$h][1] = $langs->trans('Info');
$hselected=$h;
$h++;

$head[$h][0] = DOL_URL_ROOT.'/comm/propal/document.php?propalid='.$propal->id;
$head[$h][1] = $langs->trans('Documents');
$h++;

dolibarr_fiche_head($head, $hselected, $langs->trans('Proposal'));
$head = propal_prepare_head($propal);
dolibarr_fiche_head($head, 'info', $langs->trans('Proposal'));

$propal->info($propal->id);

Expand Down
57 changes: 15 additions & 42 deletions htdocs/comm/propal/note.php
View file
Expand Up @@ -31,6 +31,7 @@

require('./pre.inc.php');
require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");

$langs->load('propal');
$langs->load('compta');
Expand Down Expand Up @@ -109,55 +110,27 @@
$societe = new Societe($db);
if ( $societe->fetch($propal->soc_id) )
{
$h=0;

$head[$h][0] = DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id;
$head[$h][1] = $langs->trans('CommercialCard');
$h++;

$head[$h][0] = DOL_URL_ROOT.'/compta/propal.php?propalid='.$propal->id;
$head[$h][1] = $langs->trans('AccountancyCard');
$h++;

if ($conf->use_preview_tabs)
{
$head[$h][0] = DOL_URL_ROOT.'/comm/propal/apercu.php?propalid='.$propal->id;
$head[$h][1] = $langs->trans("Preview");
$h++;
}

$head[$h][0] = DOL_URL_ROOT.'/comm/propal/note.php?propalid='.$propal->id;
$head[$h][1] = $langs->trans('Note');
$hselected=$h;
$h++;

$head[$h][0] = DOL_URL_ROOT.'/comm/propal/info.php?propalid='.$propal->id;
$head[$h][1] = $langs->trans('Info');
$h++;

$head[$h][0] = DOL_URL_ROOT.'/comm/propal/document.php?propalid='.$propal->id;
$head[$h][1] = $langs->trans('Documents');
$h++;

dolibarr_fiche_head($head, $hselected, $langs->trans("Proposal"));
$head = propal_prepare_head($propal);
dolibarr_fiche_head($head, 'note', $langs->trans('Proposal'));

print '<table class="border" width="100%">';

print '<tr><td width="25%">'.$langs->trans('Ref').'</td><td colspan="3">'.$propal->ref_url.'</td></tr>';

// Société
print '<tr><td>'.$langs->trans('Company').'</td><td colspan="5">';
if ($societe->client == 1)
{
$url ='fiche.php?socid='.$societe->id;
}
else
{
$url = DOL_URL_ROOT.'/comm/prospect/fiche.php?socid='.$societe->id;
}
print '<a href="'.$url.'">'.$societe->nom.'</a></td>';
print '</tr>';
print '<tr><td>'.$langs->trans('Company').'</td><td colspan="5">'.$societe->getNomUrl(1).'</td></tr>';

// Ligne info remises tiers
print '<tr><td>'.$langs->trans('Discounts').'</td><td colspan="5">';
if ($societe->remise_client) print $langs->trans("CompanyHasRelativeDiscount",$societe->remise_client);
else print $langs->trans("CompanyHasNoRelativeDiscount");
$absolute_discount=$societe->getCurrentDiscount();
print '. ';
if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount,$langs->trans("Currency".$conf->monnaie));
else print $langs->trans("CompanyHasNoAbsoluteDiscount");
print '.';
print '</td></tr>';

// Date
print '<tr><td>'.$langs->trans('Date').'</td><td>';
print dolibarr_print_date($propal->date,'%a %d %B %Y');
Expand Down
45 changes: 4 additions & 41 deletions htdocs/compta/propal.php
View file
Expand Up @@ -30,6 +30,7 @@

require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php");
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/project.class.php');
if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT.'/commande/commande.class.php');
Expand Down Expand Up @@ -121,37 +122,9 @@

$propal = new Propal($db);
$propal->fetch($_GET["propalid"]);
$h=0;

$head[$h][0] = DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id;
$head[$h][1] = $langs->trans('CommercialCard');
$h++;

$head[$h][0] = DOL_URL_ROOT.'/compta/propal.php?propalid='.$propal->id;
$head[$h][1] = $langs->trans('AccountancyCard');
$hselected=$h;
$h++;

if ($conf->use_preview_tabs)
{
$head[$h][0] = DOL_URL_ROOT.'/comm/propal/apercu.php?propalid='.$propal->id;
$head[$h][1] = $langs->trans("Preview");
$h++;
}

$head[$h][0] = DOL_URL_ROOT.'/comm/propal/note.php?propalid='.$propal->id;
$head[$h][1] = $langs->trans('Note');
$h++;

$head[$h][0] = DOL_URL_ROOT.'/comm/propal/info.php?propalid='.$propal->id;
$head[$h][1] = $langs->trans('Info');
$h++;

$head[$h][0] = DOL_URL_ROOT.'/comm/propal/document.php?propalid='.$propal->id;
$head[$h][1] = $langs->trans('Documents');
$h++;

dolibarr_fiche_head($head, $hselected, $langs->trans('Proposal'));
$head = propal_prepare_head($propal);
dolibarr_fiche_head($head, 'compta', $langs->trans('Proposal'));


/*
Expand Down Expand Up @@ -182,17 +155,7 @@
$rowspan=9;

// Société
print '<tr><td>'.$langs->trans('Company').'</td><td colspan="5">';
if ($societe->client == 1)
{
$url ='fiche.php?socid='.$societe->id;
}
else
{
$url = DOL_URL_ROOT.'/comm/prospect/fiche.php?socid='.$societe->id;
}
print '<a href="'.$url.'">'.$societe->nom.'</a></td>';
print '</tr>';
print '<tr><td>'.$langs->trans('Company').'</td><td colspan="5">'.$societe->getNomUrl(1).'</td></tr>';

// Ligne info remises tiers
print '<tr><td>'.$langs->trans('Discounts').'</td><td colspan="5">';
Expand Down

0 comments on commit 59a18bb

Please sign in to comment.