Look: Uniformisation formulaire propal. La ref est donne toujours en premire ligne.
This commit is contained in:
parent
7ace7a3b27
commit
53c5e6af44
@ -422,7 +422,7 @@ if ($_GET['propalid'] > 0)
|
||||
$head[$h][1] = $langs->trans('Documents');
|
||||
$h++;
|
||||
|
||||
dolibarr_fiche_head($head, $hselected, $langs->trans('Proposal').': '.$propal->ref);
|
||||
dolibarr_fiche_head($head, $hselected, $langs->trans('Proposal'));
|
||||
|
||||
/*
|
||||
* Confirmation de la suppression de la propale
|
||||
@ -464,6 +464,9 @@ if ($_GET['propalid'] > 0)
|
||||
$societe->fetch($obj->idp);
|
||||
|
||||
print '<table class="border" width="100%">';
|
||||
|
||||
print '<tr><td>'.$langs->trans('Ref').'</td><td colspan="5">'.$propal->ref_url.'</td></tr>';
|
||||
|
||||
$rowspan=6;
|
||||
|
||||
// Société
|
||||
|
||||
@ -104,7 +104,7 @@ if ($_GET["propalid"] > 0) {
|
||||
$head[$h][1] = $langs->trans('Documents');
|
||||
$h++;
|
||||
|
||||
dolibarr_fiche_head($head, $hselected, $langs->trans('Proposal').': '.$propal->ref);
|
||||
dolibarr_fiche_head($head, $hselected, $langs->trans('Proposal'));
|
||||
|
||||
|
||||
/*
|
||||
@ -119,8 +119,6 @@ if ($_GET["propalid"] > 0) {
|
||||
$result = $db->query($sql);
|
||||
|
||||
|
||||
|
||||
|
||||
if ($result) {
|
||||
if ($db->num_rows($result)) {
|
||||
$obj = $db->fetch_object($result);
|
||||
@ -129,6 +127,9 @@ if ($_GET["propalid"] > 0) {
|
||||
$societe->fetch($obj->idp);
|
||||
|
||||
print '<table class="border" width="100%">';
|
||||
|
||||
print '<tr><td width="30%">'.$langs->trans('Ref').'</td><td colspan="5">'.$propal->ref_url.'</td></tr>';
|
||||
|
||||
$rowspan=3;
|
||||
// ligne 1
|
||||
// partie Gauche
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2005 Regis Houssin <regis.houssin@cap-networks.com>
|
||||
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2005 Regis Houssin <regis.houssin@cap-networks.com>
|
||||
*
|
||||
* 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
|
||||
@ -19,7 +19,6 @@
|
||||
*
|
||||
* $Id$
|
||||
* $Source$
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
@ -87,7 +86,7 @@ $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').': '.$propal->ref);
|
||||
dolibarr_fiche_head($head, $hselected, $langs->trans('Proposal'));
|
||||
|
||||
$propal->info($propal->id);
|
||||
|
||||
|
||||
@ -139,10 +139,12 @@ if ($_GET['propalid'])
|
||||
$head[$h][1] = $langs->trans('Documents');
|
||||
$h++;
|
||||
|
||||
dolibarr_fiche_head($head, $hselected, $langs->trans("Proposal").": $propal->ref");
|
||||
dolibarr_fiche_head($head, $hselected, $langs->trans("Proposal"));
|
||||
|
||||
print '<table class="border" width="100%">';
|
||||
|
||||
print '<tr><td>'.$langs->trans('Ref').'</td><td colspan="3">'.$propal->ref_url.'</td></tr>';
|
||||
|
||||
print '<tr><td>'.$langs->trans('Company').'</td><td>';
|
||||
if ($societe->client == 1)
|
||||
{
|
||||
|
||||
@ -96,7 +96,7 @@ $html = new Form($db);
|
||||
*/
|
||||
if ($_GET["propalid"] > 0)
|
||||
{
|
||||
if ($msg) print "$msg<br>";
|
||||
if ($mesg) print "$mesg<br>";
|
||||
|
||||
$propal = new Propal($db);
|
||||
$propal->fetch($_GET["propalid"]);
|
||||
@ -130,7 +130,7 @@ if ($_GET["propalid"] > 0)
|
||||
$head[$h][1] = $langs->trans('Documents');
|
||||
$h++;
|
||||
|
||||
dolibarr_fiche_head($head, $hselected, $langs->trans('Proposal').': '.$propal->ref);
|
||||
dolibarr_fiche_head($head, $hselected, $langs->trans('Proposal'));
|
||||
|
||||
|
||||
/*
|
||||
@ -154,6 +154,9 @@ if ($_GET["propalid"] > 0)
|
||||
$societe->fetch($obj->idp);
|
||||
|
||||
print '<table class="border" width="100%">';
|
||||
|
||||
print '<tr><td>'.$langs->trans('Ref').'</td><td colspan="5">'.$propal->ref_url.'</td></tr>';
|
||||
|
||||
$rowspan=6;
|
||||
|
||||
// Société
|
||||
|
||||
Loading…
Reference in New Issue
Block a user