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

Fix: Utilisation de getNomUrl plutot que code en dur pour afficher picto socit

Browse Source
This commit is contained in:
Laurent Destailleur 2006-06-18 14:35:35 +00:00
parent b565f51c7d
commit 75708f4b99
4 changed files with 159 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
htdocs/expedition/expedition.class.php
View File

@ -1,5 +1,6 @@
<?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2006 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
@ -17,7 +18,6 @@
*
* $Id$
* $Source$
*
*/
/**
@ -27,23 +27,26 @@
\version $Revision$
*/
require_once(DOL_DOCUMENT_ROOT."/commonobject.class.php");
/**
\class Expedition
\brief Classe de gestion des expeditions
*/
class Expedition
class Expedition extends CommonObject
{
var $db ;
var $id ;
var $brouillon;
var $entrepot_id;
var $db;
var $id;
var $brouillon;
var $entrepot_id;
/**
* Initialisation
*
*/
function Expedition($DB)
/**
* Initialisation
*
*/
function Expedition($DB)
{
$this->db = $DB;
$this->lignes = array();

235
htdocs/fichinter/fiche.php
View File

@ -36,6 +36,7 @@ if (defined("FICHEINTER_ADDON") && is_readable(DOL_DOCUMENT_ROOT ."/includes/mod
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/ficheinter/".FICHEINTER_ADDON.".php");
}
$langs->load("companies");
$langs->load("interventions");
$user->getrights("ficheinter");
@ -64,13 +65,13 @@ if ($_GET["action"] == 'valid')
{
$fichinter = new Fichinter($db);
$fichinter->id = $_GET["id"];
$fichinter->valid($user->id, $conf->fichinter->outputdir);
$fichinter->valid($user->id, $conf->fichinter->outputdir);
}
if ($_POST["action"] == 'add')
{
$fichinter = new Fichinter($db);
$fichinter->date = $db->idate(mktime(12, 1 , 1, $_POST["pmonth"], $_POST["pday"], $_POST["pyear"]));
$fichinter->socidp = $_POST["socidp"];
$fichinter->duree = $_POST["duree"];
@ -78,7 +79,7 @@ if ($_POST["action"] == 'add')
$fichinter->author = $user->id;
$fichinter->note = $_POST["note"];
$fichinter->ref = $_POST["ref"];
$id = $fichinter->create();
$_GET["id"]=$id; // Force raffraichissement sur fiche venant d'etre créée
}
@ -86,7 +87,7 @@ if ($_POST["action"] == 'add')
if ($_POST["action"] == 'update')
{
$fichinter = new Fichinter($db);
$fichinter->date = $db->idate(mktime(12, 1 , 1, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]));
$fichinter->socidp = $_POST["socidp"];
$fichinter->duree = $_POST["duree"];
@ -94,7 +95,7 @@ if ($_POST["action"] == 'update')
$fichinter->author = $user->id;
$fichinter->note = $_POST["note"];
$fichinter->ref = $_POST["ref"];
$fichinter->update($_POST["id"]);
$_GET["id"]=$_POST["id"]; // Force raffraichissement sur fiche venant d'etre créée
}
@ -111,7 +112,7 @@ if ($_REQUEST['action'] == 'builddoc') // En get ou en post
{
dolibarr_print_error($db,$result);
exit;
}
}
}
@ -132,102 +133,101 @@ $sel = new Form($db);
*/
if ($_GET["action"] == 'create')
{
print_titre($langs->trans("AddIntervention"));
// \todo Utiliser un module de numérotation
$numpr = "FI".strftime("%y%m%d", time());
$sql = "SELECT count(*) FROM ".MAIN_DB_PREFIX."propal";
$sql.= " WHERE ref like '${numpr}%'";
$resql=$db->query($sql);
if ($resql)
{
$num = $db->result(0, 0);
$db->free($resql);
if ($num > 0)
print_titre($langs->trans("AddIntervention"));
// \todo Utiliser un module de numérotation
$numpr = "FI".strftime("%y%m%d", time());
$sql = "SELECT count(*) FROM ".MAIN_DB_PREFIX."propal";
$sql.= " WHERE ref like '${numpr}%'";
$resql=$db->query($sql);
if ($resql)
{
$numpr .= "." . ($num + 1);
$num = $db->result(0, 0);
$db->free($resql);
if ($num > 0)
{
$numpr .= "." . ($num + 1);
}
}
}
$fix = new Fichinter($db);
$obj = $conf->global->FICHEINTER_ADDON;
$fix = new Fichinter($db);
// \todo Quand module numerotation fiche inter sera dispo
// $modFicheinter = new $obj;
// $numpr = $modFicheinter->getNextValue($soc);
$obj = $conf->global->FICHEINTER_ADDON;
$numpr = $fix->get_new_num($societe);
print "<form name='fichinter' action=\"fiche.php\" method=\"post\">";
$smonth = 1;
$syear = date("Y", time());
print '<table class="border" width="100%">';
print '<input type="hidden" name="socidp" value='.$_GET["socidp"].'>';
print "<tr><td>".$langs->trans("Company")."</td><td>".$societe->getNomUrl(1)."</td></tr>";
print "<tr><td>".$langs->trans("Date")."</td><td>";
$sel->select_date(time(),"p",'','','','fichinter');
print "</td></tr>";
print "<input type=\"hidden\" name=\"action\" value=\"add\">";
print "<tr><td>".$langs->trans("Ref")."</td><td><input name=\"ref\" value=\"$numpr\"></td></tr>\n";
print "<tr><td>".$langs->trans("Duration")." (".$langs->trans("days").")</td><td><input name=\"duree\"></td></tr>\n";
if ($conf->projet->enabled)
{
// Projet associe
$langs->load("project");
print '<tr><td valign="top">'.$langs->trans("Project").'</td><td><select name="projetidp">';
print '<option value="0"></option>';
$sql = 'SELECT p.rowid, p.title FROM '.MAIN_DB_PREFIX.'projet as p WHERE p.fk_soc = '.$_GET["socidp"];
$resql=$db->query($sql);
if ($resql)
// \todo Quand module numerotation fiche inter sera dispo
// $modFicheinter = new $obj;
// $numpr = $modFicheinter->getNextValue($soc);
$numpr = $fix->get_new_num($societe);
print "<form name='fichinter' action=\"fiche.php\" method=\"post\">";
$smonth = 1;
$syear = date("Y", time());
print '<table class="border" width="100%">';
print '<input type="hidden" name="socidp" value='.$_GET["socidp"].'>';
print "<tr><td>".$langs->trans("Company")."</td><td>".$societe->getNomUrl(1)."</td></tr>";
print "<tr><td>".$langs->trans("Date")."</td><td>";
$sel->select_date(time(),"p",'','','','fichinter');
print "</td></tr>";
print "<input type=\"hidden\" name=\"action\" value=\"add\">";
print "<tr><td>".$langs->trans("Ref")."</td><td><input name=\"ref\" value=\"$numpr\"></td></tr>\n";
print "<tr><td>".$langs->trans("Duration")." (".$langs->trans("days").")</td><td><input name=\"duree\"></td></tr>\n";
if ($conf->projet->enabled)
{
$i = 0 ;
$numprojet = $db->num_rows($resql);
while ($i < $numprojet)
{
$projet = $db->fetch_object($resql);
print "<option value=\"$projet->rowid\">$projet->title</option>";
$i++;
}
$db->free($resql);
}
print '</select>';
if ($numprojet==0)
{
print 'Cette société n\'a pas de projet.&nbsp;';
// Projet associe
$langs->load("project");
print '<tr><td valign="top">'.$langs->trans("Project").'</td><td><select name="projetidp">';
print '<option value="0"></option>';
$user->getrights("projet");
$sql = 'SELECT p.rowid, p.title FROM '.MAIN_DB_PREFIX.'projet as p WHERE p.fk_soc = '.$_GET["socidp"];
if ($user->rights->projet->creer)
{
print '<a href='.DOL_URL_ROOT.'/projet/fiche.php?socidp='.$socidp.'&action=create>'.$langs->trans("Add").'</a>';
}
$resql=$db->query($sql);
if ($resql)
{
$i = 0 ;
$numprojet = $db->num_rows($resql);
while ($i < $numprojet)
{
$projet = $db->fetch_object($resql);
print "<option value=\"$projet->rowid\">$projet->title</option>";
$i++;
}
$db->free($resql);
}
print '</select>';
if ($numprojet==0)
{
print 'Cette société n\'a pas de projet.&nbsp;';
$user->getrights("projet");
if ($user->rights->projet->creer)
{
print '<a href='.DOL_URL_ROOT.'/projet/fiche.php?socidp='.$socidp.'&action=create>'.$langs->trans("Add").'</a>';
}
}
}
}
print '</td></tr>';
print '<tr><td valign="top">'.$langs->trans("Description").'</td>';
print "<td><textarea name=\"note\" wrap=\"soft\" cols=\"60\" rows=\"15\"></textarea>";
print '</td></tr>';
print '<tr><td colspan="2" align="center">';
print '<input type="submit" class="button" value="'.$langs->trans("CreateDaftIntervention").'">';
print '</td></tr>';
print '</table>';
print '</form>';
print '</td></tr>';
print '<tr><td valign="top">'.$langs->trans("Description").'</td>';
print "<td><textarea name=\"note\" wrap=\"soft\" cols=\"60\" rows=\"15\"></textarea>";
print '</td></tr>';
print '<tr><td colspan="2" align="center">';
print '<input type="submit" class="button" value="'.$langs->trans("CreateDaftIntervention").'">';
print '</td></tr>';
print '</table>';
print '</form>';
}
@ -241,12 +241,11 @@ if ($_GET["action"] == 'edit')
{
$fichinter = new Fichinter($db);
$fichinter->fetch($_GET["id"]);
$fichinter->fetch_client();
dolibarr_fiche_head($head, $a, $langs->trans("EditIntervention"));
/*
* Initialisation de la liste des projets
*/
print "<form name='update' action=\"fiche.php\" method=\"post\">";
print "<input type=\"hidden\" name=\"action\" value=\"update\">";
@ -254,8 +253,13 @@ if ($_GET["action"] == 'edit')
print '<table class="border" width="100%">';
// Ref
print '<tr><td>'.$langs->trans("Ref").'</td><td>'.$fichinter->ref.'</td></tr>';
// Tiers
print "<tr><td>".$langs->trans("Company")."</td><td>".$fichinter->client->getNomUrl(1)."</td></tr>";
// Date
print "<tr><td>".$langs->trans("Date")."</td><td>";
$sel->select_date($fichinter->date,'','','','','update');
print "</td></tr>";
@ -270,6 +274,7 @@ if ($_GET["action"] == 'edit')
print '</td></tr>';
}
// Description
print '<tr><td valign="top">'.$langs->trans("Description").'</td>';
print '<td><textarea name="note" wrap="soft" cols="60" rows="12">';
print $fichinter->note;
@ -286,15 +291,14 @@ if ($_GET["action"] == 'edit')
print '</div>';
}
/*
* Mode visu
*
*/
/*
* Affichage en mode visu
*/
if ($_GET["id"] && $_GET["action"] != 'edit')
{
if ($mesg) print $mesg."<br>";
dolibarr_fiche_head($head, $a, $langs->trans("InterventionCard"));
$fichinter = new Fichinter($db);
@ -304,13 +308,20 @@ if ($_GET["id"] && $_GET["action"] != 'edit')
dolibarr_print_error($db);
exit;
}
$fichinter->fetch_client();
print '<table class="border" width="100%">';
// Ref
print '<tr><td>'.$langs->trans("Ref").'</td><td>'.$fichinter->ref.'</td></tr>';
print '<tr><td>'.$langs->trans("Company").'</td><td><a href="../comm/fiche.php?socid='.$fichinter->client->id.'">'.$fichinter->client->nom.'</a></td></tr>';
// Societe
print "<tr><td>".$langs->trans("Company")."</td><td>".$fichinter->client->getNomUrl(1)."</td></tr>";
// Date
print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dolibarr_print_date($fichinter->date,"%A %d %B %Y").'</td></tr>';
// Durée
print '<tr><td>'.$langs->trans("Duration").'</td><td>'.$fichinter->duree.'</td></tr>';
if ($conf->projet->enabled)
@ -318,17 +329,19 @@ if ($_GET["id"] && $_GET["action"] != 'edit')
$fichinter->fetch_projet();
print '<tr><td valign="top">'.$langs->trans("Project").'</td><td>'.$fichinter->projet.'</td></tr>';
}
// Statut
print '<tr><td>'.$langs->trans("Status").'</td><td>'.$fichinter->getLibStatut(4).'</td></tr>';
// Description
print '<tr><td valign="top">'.$langs->trans("Description").'</td>';
print '<td>';
print nl2br($fichinter->note);
print '</td></tr>';
print '</td></tr>';
print "</table>";
print '</div>';
/**
* Barre d'actions
@ -355,7 +368,7 @@ if ($_GET["id"] && $_GET["action"] != 'edit')
print '<a class="tabAction" href="fiche.php?id='.$_GET["id"].'&action=builddoc">'.$langs->trans("BuildPDF").'</a>';
}
if ($fichinter->statut >= 0)
if ($fichinter->statut > 0)
{
$langs->load("bills");
print '<a class="tabAction" href="fiche.php?id='.$_GET["id"].'&action=builddoc">'.$langs->trans("RebuildPDF").'</a>';
@ -376,17 +389,17 @@ if ($_GET["id"] && $_GET["action"] != 'edit')
//$delallowed=$user->rights->fichinter->supprimer;
$genallowed=1;
$delallowed=0;
$var=true;
print "<br>\n";
$sel->show_documents('ficheinter',$filename,$filedir,$urlsource,$genallowed,$delallowed,$ficheinter->modelpdf);
print "</td><td>";
print "&nbsp;";
print "</tr></table>\n";
}

8
htdocs/fichinter/fichinter.class.php
View File

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-2006 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
@ -18,7 +18,6 @@
*
* $Id$
* $Source$
*
*/
/** \file htdocs/fichinter/fichinter.class.php
@ -27,16 +26,18 @@
\version $Revision$
*/
require_once(DOL_DOCUMENT_ROOT ."/commonobject.class.php");
require_once(DOL_DOCUMENT_ROOT ."/notify.class.php");
/** \class Ficheinter
\brief Classe des gestion des fiches interventions
*/
class Fichinter
class Fichinter extends CommonObject
{
var $id;
var $db;
var $socidp;
var $author;
var $ref;
@ -45,6 +46,7 @@ class Fichinter
var $note;
var $projet_id;
/**
* \brief Constructeur de la classe
* \param DB Handler accès base de données

30
htdocs/livraison/livraison.class.php
View File

@ -1,6 +1,7 @@
<?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2006 Regis Houssin <regis.houssin@cap-networks.com>
* Copyright (C) 2006 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
@ -18,7 +19,6 @@
*
* $Id$
* $Source$
*
*/
/**
@ -28,26 +28,28 @@
\version $Revision$
*/
require_once(DOL_DOCUMENT_ROOT."/commonobject.class.php");
require_once(DOL_DOCUMENT_ROOT."/expedition/expedition.class.php");
/**
\class Livraison
\brief Classe de gestion des bons de livraison
*/
require_once(DOL_DOCUMENT_ROOT."/expedition/expedition.class.php");
class Livraison
class Livraison extends CommonObject
{
var $db ;
var $id ;
var $brouillon;
var $commande_id;
var $db;
var $id;
var $brouillon;
var $commande_id;
/**
* Initialisation
*
*/
function Livraison($DB)
/**
* Initialisation
*
*/
function Livraison($DB)
{
$this->db = $DB;
$this->lignes = array();