Uniformisation code
This commit is contained in:
Laurent Destailleur
parent
a34b8a3aab
commit
c6ba86986f
@ -496,7 +496,10 @@ if ($_GET["id"] > 0)
|
|||||||
|
|
||||||
print '</td><td valign="top" width="50%">';
|
print '</td><td valign="top" width="50%">';
|
||||||
|
|
||||||
// Rien a droite
|
// List of actions on element
|
||||||
|
include_once(DOL_DOCUMENT_ROOT.'/html.formactions.class.php');
|
||||||
|
$formactions=new FormActions($db);
|
||||||
|
$somethingshown=$formactions->showactions($commande,'order',$socid);
|
||||||
|
|
||||||
print "</td></tr></table>";
|
print "</td></tr></table>";
|
||||||
|
|
||||||
|
|||||||
@ -2954,6 +2954,8 @@ else
|
|||||||
|
|
||||||
print '</td><td valign="top" width="50%">';
|
print '</td><td valign="top" width="50%">';
|
||||||
|
|
||||||
|
print '<br>';
|
||||||
|
|
||||||
// List of actions on element
|
// List of actions on element
|
||||||
include_once(DOL_DOCUMENT_ROOT.'/html.formactions.class.php');
|
include_once(DOL_DOCUMENT_ROOT.'/html.formactions.class.php');
|
||||||
$formactions=new FormActions($db);
|
$formactions=new FormActions($db);
|
||||||
|
|||||||
@ -594,53 +594,10 @@ if ($_GET["propalid"] > 0)
|
|||||||
|
|
||||||
print '</td><td valign="top" width="50%">';
|
print '</td><td valign="top" width="50%">';
|
||||||
|
|
||||||
|
// List of actions on element
|
||||||
/*
|
include_once(DOL_DOCUMENT_ROOT.'/html.formactions.class.php');
|
||||||
* Liste des actions propres a la propal
|
$formactions=new FormActions($db);
|
||||||
*/
|
$somethingshown=$formactions->showactions($propal,'propal',$socid);
|
||||||
if ($conf->agenda->enabled && $user->rights->agenda->myactions->create)
|
|
||||||
{
|
|
||||||
$sql = 'SELECT id, '.$db->pdate('a.datea'). ' as da, label, note, fk_user_author' ;
|
|
||||||
$sql .= ' FROM '.MAIN_DB_PREFIX.'actioncomm as a';
|
|
||||||
$sql .= ' WHERE a.fk_soc = '.$societe->id.' AND a.propalrowid = '.$propal->id ;
|
|
||||||
$resql = $db->query($sql);
|
|
||||||
if ($resql)
|
|
||||||
{
|
|
||||||
$num = $db->num_rows($resql);
|
|
||||||
if ($num)
|
|
||||||
{
|
|
||||||
print_titre($langs->trans('ActionsOnPropal'));
|
|
||||||
$i = 0;
|
|
||||||
$total = 0;
|
|
||||||
$var=true;
|
|
||||||
|
|
||||||
print '<table class="border" width="100%">';
|
|
||||||
print '<tr '.$bc[$var].'><td>'.$langs->trans('Ref').'</td><td>'.$langs->trans('Date').'</td><td>'.$langs->trans('Action').'</td><td>'.$langs->trans('By').'</td></tr>';
|
|
||||||
print "\n";
|
|
||||||
|
|
||||||
while ($i < $num)
|
|
||||||
{
|
|
||||||
$objp = $db->fetch_object($resql);
|
|
||||||
$var=!$var;
|
|
||||||
print '<tr '.$bc[$var].'>';
|
|
||||||
print '<td><a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?id='.$objp->id.'">'.img_object($langs->trans('ShowTask'),'task').' '.$objp->id.'</a></td>';
|
|
||||||
print '<td>'.dolibarr_print_date($objp->da,'dayhour')."</td>\n";
|
|
||||||
print '<td>'.stripslashes($objp->label).'</td>';
|
|
||||||
$authoract = new User($db);
|
|
||||||
$authoract->id = $objp->fk_user_author;
|
|
||||||
$authoract->fetch('');
|
|
||||||
print '<td>'.$authoract->login.'</td>';
|
|
||||||
print "</tr>\n";
|
|
||||||
$i++;
|
|
||||||
}
|
|
||||||
print '</table>';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
dolibarr_print_error($db);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
print '</td></tr></table>';
|
print '</td></tr></table>';
|
||||||
|
|
||||||
|
|||||||
109
htdocs/html.formactions.class.php
Normal file
109
htdocs/html.formactions.class.php
Normal file
@ -0,0 +1,109 @@
|
|||||||
|
<?php
|
||||||
|
/* Copyright (c) 2008 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
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
\file htdocs/html.formactions.class.php
|
||||||
|
\brief Fichier de la classe des fonctions prédéfinie de composants html actions
|
||||||
|
\version $Id$
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
\class FormActions
|
||||||
|
\brief Classe permettant la génération de composants html actions
|
||||||
|
*/
|
||||||
|
class FormActions
|
||||||
|
{
|
||||||
|
var $db;
|
||||||
|
var $error;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* \brief Constructeur
|
||||||
|
* \param DB handler d'accès base de donnée
|
||||||
|
*/
|
||||||
|
function FormActions($DB)
|
||||||
|
{
|
||||||
|
$this->db = $DB;
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* \brief Show list of actions for element
|
||||||
|
* \param object Object
|
||||||
|
* \param typeelement 'invoice','propal','order'
|
||||||
|
* \param socid socid of user
|
||||||
|
* \return int <0 if KO, >=0 if OK
|
||||||
|
*/
|
||||||
|
function showactions($object,$typeelement,$socid=0)
|
||||||
|
{
|
||||||
|
global $langs,$conf,$user;
|
||||||
|
global $bc;
|
||||||
|
|
||||||
|
$sql = 'SELECT a.id, '.$this->db->pdate('a.datep').' as da, a.label, a.note,';
|
||||||
|
$sql.= ' u.login';
|
||||||
|
$sql.= ' FROM '.MAIN_DB_PREFIX.'actioncomm as a, '.MAIN_DB_PREFIX.'user as u';
|
||||||
|
$sql.= ' WHERE a.fk_user_author = u.rowid';
|
||||||
|
if ($socid) $sql .= ' AND a.fk_soc = '.$socid;
|
||||||
|
if ($typeelement == 'invoice') $sql.= ' AND a.fk_facture = '.$object->id;
|
||||||
|
if ($typeelement == 'propal') $sql.= ' AND a.propalrowid = '.$object->id;
|
||||||
|
if ($typeelement == 'order') $sql.= ' AND a.fk_commande = '.$object->id;
|
||||||
|
|
||||||
|
dolibarr_syslog("FormActions::showactions sql=".$sql);
|
||||||
|
$resql = $this->db->query($sql);
|
||||||
|
if ($resql)
|
||||||
|
{
|
||||||
|
$num = $this->db->num_rows($resql);
|
||||||
|
if ($num)
|
||||||
|
{
|
||||||
|
if ($typeelement == 'invoice') $title=$langs->trans('ActionsOnBill');
|
||||||
|
if ($typeelement == 'propal') $title=$langs->trans('ActionsOnPropal');
|
||||||
|
if ($typeelement == 'order') $title=$langs->trans('ActionsOnOrder');
|
||||||
|
print_titre($title);
|
||||||
|
|
||||||
|
$i = 0; $total = 0; $var=true;
|
||||||
|
print '<table class="border" width="100%">';
|
||||||
|
print '<tr '.$bc[$var].'><td>'.$langs->trans('Ref').'</td><td>'.$langs->trans('Date').'</td><td>'.$langs->trans('Action').'</td><td>'.$langs->trans('By').'</td></tr>';
|
||||||
|
print "\n";
|
||||||
|
|
||||||
|
while ($i < $num)
|
||||||
|
{
|
||||||
|
$objp = $this->db->fetch_object($resql);
|
||||||
|
$var=!$var;
|
||||||
|
print '<tr '.$bc[$var].'>';
|
||||||
|
print '<td><a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?id='.$objp->id.'">'.img_object($langs->trans('ShowTask'),'task').' '.$objp->id.'</a></td>';
|
||||||
|
print '<td>'.dolibarr_print_date($objp->da,'day').'</td>';
|
||||||
|
print '<td>'.$objp->label.'</td>';
|
||||||
|
print '<td>'.$objp->login.'</td>';
|
||||||
|
print '</tr>';
|
||||||
|
$i++;
|
||||||
|
}
|
||||||
|
print '</table>';
|
||||||
|
}
|
||||||
|
|
||||||
|
return $num;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
dolibarr_print_error($this->db);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -250,3 +250,4 @@ alter table llx_socpeople add priv smallint NOT NULL DEFAULT 0 after
|
|||||||
|
|
||||||
alter table llx_tva modify fk_bank integer;
|
alter table llx_tva modify fk_bank integer;
|
||||||
|
|
||||||
|
delete from llx_const where name='MAIN_USE_PREVIEW_TABS';
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user