Never use the source cvs tag in code (this make problems with patch commands)
This commit is contained in:
parent
0b31e61313
commit
1d7af72c8e
@ -15,7 +15,6 @@
|
|||||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
*
|
*
|
||||||
* $Id$
|
* $Id$
|
||||||
* $Source$
|
|
||||||
*}
|
*}
|
||||||
|
|
||||||
<!-- BEGIN SMARTY TEMPLATE -->
|
<!-- BEGIN SMARTY TEMPLATE -->
|
||||||
|
|||||||
@ -16,7 +16,6 @@
|
|||||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
*
|
*
|
||||||
* $Id$
|
* $Id$
|
||||||
* $Source$
|
|
||||||
*}
|
*}
|
||||||
|
|
||||||
<!-- BEGIN SMARTY TEMPLATE -->
|
<!-- BEGIN SMARTY TEMPLATE -->
|
||||||
|
|||||||
@ -16,7 +16,6 @@
|
|||||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
*
|
*
|
||||||
* $Id$
|
* $Id$
|
||||||
* $Source$
|
|
||||||
*}
|
*}
|
||||||
|
|
||||||
<!-- BEGIN SMARTY TEMPLATE -->
|
<!-- BEGIN SMARTY TEMPLATE -->
|
||||||
|
|||||||
@ -16,7 +16,6 @@
|
|||||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
*
|
*
|
||||||
* $Id$
|
* $Id$
|
||||||
* $Source$
|
|
||||||
*}
|
*}
|
||||||
|
|
||||||
<!-- BEGIN SMARTY TEMPLATE -->
|
<!-- BEGIN SMARTY TEMPLATE -->
|
||||||
|
|||||||
@ -16,7 +16,6 @@
|
|||||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
*
|
*
|
||||||
* $Id$
|
* $Id$
|
||||||
* $Source$
|
|
||||||
*}
|
*}
|
||||||
|
|
||||||
<!-- BEGIN SMARTY TEMPLATE -->
|
<!-- BEGIN SMARTY TEMPLATE -->
|
||||||
|
|||||||
@ -1,4 +1,24 @@
|
|||||||
<!-- BEGIN SMARTY TEMPLATE -->
|
{* Copyright (C) 2006-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||||
|
* Copyright (C) 2006-2007 Auguria SARL <info@auguria.org>
|
||||||
|
*
|
||||||
|
* 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.
|
||||||
|
*
|
||||||
|
* $Id$
|
||||||
|
*}
|
||||||
|
|
||||||
|
<!-- BEGIN SMARTY TEMPLATE -->
|
||||||
|
|
||||||
<form id="evolForm" action="fiche.php" method="post">
|
<form id="evolForm" action="fiche.php" method="post">
|
||||||
<input type="hidden" name="action" value="update">
|
<input type="hidden" name="action" value="update">
|
||||||
|
|||||||
@ -1,4 +1,24 @@
|
|||||||
<!-- BEGIN SMARTY TEMPLATE -->
|
{* Copyright (C) 2006-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||||
|
* Copyright (C) 2006-2007 Auguria SARL <info@auguria.org>
|
||||||
|
*
|
||||||
|
* 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.
|
||||||
|
*
|
||||||
|
* $Id$
|
||||||
|
*}
|
||||||
|
|
||||||
|
<!-- BEGIN SMARTY TEMPLATE -->
|
||||||
<table class="border" width="100%">
|
<table class="border" width="100%">
|
||||||
<tr>
|
<tr>
|
||||||
<td width="15%">Référence</td>
|
<td width="15%">Référence</td>
|
||||||
|
|||||||
@ -1,4 +1,24 @@
|
|||||||
<!-- BEGIN SMARTY TEMPLATE -->
|
{* Copyright (C) 2006-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||||
|
* Copyright (C) 2006-2007 Auguria SARL <info@auguria.org>
|
||||||
|
*
|
||||||
|
* 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.
|
||||||
|
*
|
||||||
|
* $Id$
|
||||||
|
*}
|
||||||
|
|
||||||
|
<!-- BEGIN SMARTY TEMPLATE -->
|
||||||
|
|
||||||
<form id="evolForm" action="fiche.php" method="post">
|
<form id="evolForm" action="fiche.php" method="post">
|
||||||
<input type="hidden" name="action" value="update">
|
<input type="hidden" name="action" value="update">
|
||||||
|
|||||||
@ -1,4 +1,24 @@
|
|||||||
<!-- BEGIN SMARTY TEMPLATE -->
|
{* Copyright (C) 2006-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||||
|
* Copyright (C) 2006-2007 Auguria SARL <info@auguria.org>
|
||||||
|
*
|
||||||
|
* 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.
|
||||||
|
*
|
||||||
|
* $Id$
|
||||||
|
*}
|
||||||
|
|
||||||
|
<!-- BEGIN SMARTY TEMPLATE -->
|
||||||
<table class="border" width="100%">
|
<table class="border" width="100%">
|
||||||
<tr>
|
<tr>
|
||||||
<td width="15%">Réf</td>
|
<td width="15%">Réf</td>
|
||||||
|
|||||||
@ -15,16 +15,13 @@
|
|||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
*
|
|
||||||
* $Id$
|
|
||||||
* $Source$
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\file htdocs/product/canvas/product.livre.class.php
|
\file htdocs/product/canvas/product.livre.class.php
|
||||||
\ingroup produit
|
\ingroup produit
|
||||||
\brief Fichier de la classe des produits specifiques de type livre
|
\brief Fichier de la classe des produits specifiques de type livre
|
||||||
\version $Revision$
|
\version $Id$
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require_once(DOL_DOCUMENT_ROOT.'/product/canvas/product.livre.class.php');
|
require_once(DOL_DOCUMENT_ROOT.'/product/canvas/product.livre.class.php');
|
||||||
@ -71,7 +68,7 @@ class ProductLivreContrat extends Product
|
|||||||
{
|
{
|
||||||
$sql = " INSERT INTO ".MAIN_DB_PREFIX."product_cnv_livre_contrat (rowid,fk_cnv_livre)";
|
$sql = " INSERT INTO ".MAIN_DB_PREFIX."product_cnv_livre_contrat (rowid,fk_cnv_livre)";
|
||||||
$sql.= " VALUES ('".$id."','".$livre_id."');";
|
$sql.= " VALUES ('".$id."','".$livre_id."');";
|
||||||
|
|
||||||
$result = $this->db->query($sql) ;
|
$result = $this->db->query($sql) ;
|
||||||
if ($result)
|
if ($result)
|
||||||
{
|
{
|
||||||
@ -129,7 +126,7 @@ class ProductLivreContrat extends Product
|
|||||||
$sql.= " FROM ".MAIN_DB_PREFIX."product_cnv_livre_contrat";
|
$sql.= " FROM ".MAIN_DB_PREFIX."product_cnv_livre_contrat";
|
||||||
if ($id) $sql.= " WHERE rowid = '".$id."'";
|
if ($id) $sql.= " WHERE rowid = '".$id."'";
|
||||||
if ($ref) $sql.= " WHERE ref = '".addslashes($ref)."'";
|
if ($ref) $sql.= " WHERE ref = '".addslashes($ref)."'";
|
||||||
|
|
||||||
$result = $this->db->query($sql) ;
|
$result = $this->db->query($sql) ;
|
||||||
|
|
||||||
if ( $result )
|
if ( $result )
|
||||||
|
|||||||
@ -14,16 +14,13 @@
|
|||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
*
|
|
||||||
* $Id$
|
|
||||||
* $Source$
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\file htdocs/product/canvas/product.livre.class.php
|
\file htdocs/product/canvas/product.livre.class.php
|
||||||
\ingroup produit
|
\ingroup produit
|
||||||
\brief Fichier de la classe des produits specifiques de type livre
|
\brief Fichier de la classe des produits specifiques de type livre
|
||||||
\version $Revision$
|
\version $Id$
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require_once(DOL_DOCUMENT_ROOT.'/product/canvas/product.livre.class.php');
|
require_once(DOL_DOCUMENT_ROOT.'/product/canvas/product.livre.class.php');
|
||||||
@ -90,7 +87,7 @@ class ProductLivreCouverture extends Product
|
|||||||
$sql = "SELECT p.rowid,p.ref,p.label";
|
$sql = "SELECT p.rowid,p.ref,p.label";
|
||||||
$sql.= " FROM ".MAIN_DB_PREFIX."product_cnv_livre as pl,".MAIN_DB_PREFIX."product as p";
|
$sql.= " FROM ".MAIN_DB_PREFIX."product_cnv_livre as pl,".MAIN_DB_PREFIX."product as p";
|
||||||
$sql.= " WHERE pl.rowid=p.rowid AND pl.fk_couverture = '".$id."'";
|
$sql.= " WHERE pl.rowid=p.rowid AND pl.fk_couverture = '".$id."'";
|
||||||
|
|
||||||
$result = $this->db->query($sql) ;
|
$result = $this->db->query($sql) ;
|
||||||
|
|
||||||
if ( $result )
|
if ( $result )
|
||||||
@ -103,7 +100,7 @@ class ProductLivreCouverture extends Product
|
|||||||
$this->db->free();
|
$this->db->free();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user