[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-cvs] dolibarr/htdocs/admin avoir.php commande.php ex...
|
From: |
Regis Houssin |
|
Subject: |
[Dolibarr-cvs] dolibarr/htdocs/admin avoir.php commande.php ex... |
|
Date: |
Fri, 09 Jun 2006 09:03:41 +0000 |
CVSROOT: /cvsroot/dolibarr
Module name: dolibarr
Changes by: Regis Houssin <hregis> 06/06/09 09:03:41
Modified files:
htdocs/admin : avoir.php commande.php expedition.php
facture.php fichinter.php fournisseur.php
livraison.php propale.php
Log message:
Fix: supprimait les autres modèles si on leur avait donné le même nom
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/dolibarr/htdocs/admin/avoir.php?cvsroot=dolibarr&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/dolibarr/htdocs/admin/commande.php?cvsroot=dolibarr&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/dolibarr/htdocs/admin/expedition.php?cvsroot=dolibarr&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/dolibarr/htdocs/admin/facture.php?cvsroot=dolibarr&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/dolibarr/htdocs/admin/fichinter.php?cvsroot=dolibarr&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/dolibarr/htdocs/admin/fournisseur.php?cvsroot=dolibarr&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/dolibarr/htdocs/admin/livraison.php?cvsroot=dolibarr&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/dolibarr/htdocs/admin/propale.php?cvsroot=dolibarr&r1=1.41&r2=1.42
Patches:
Index: avoir.php
===================================================================
RCS file: /cvsroot/dolibarr/dolibarr/htdocs/admin/avoir.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- avoir.php 2 Jun 2006 21:04:12 -0000 1.12
+++ avoir.php 9 Jun 2006 09:03:41 -0000 1.13
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * $Id: avoir.php,v 1.12 2006/06/02 21:04:12 eldy Exp $
+ * $Id: avoir.php,v 1.13 2006/06/09 09:03:41 hregis Exp $
* $Source: /cvsroot/dolibarr/dolibarr/htdocs/admin/avoir.php,v $
*/
@@ -25,7 +25,7 @@
\file htdocs/admin/avoir.php
\ingroup avoir
\brief Page d'administration/configuration du module Avoir
- \version $Revision: 1.12 $
+ \version $Revision: 1.13 $
*/
require("./pre.inc.php");
@@ -55,7 +55,9 @@
if ($_GET["action"] == 'del')
{
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE
nom='".$_GET["value"]."'";
+ $type='creditnote';
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
+ $sql .= " WHERE nom = '".$_GET["value"]."' AND type = '".$type."'";
if ($db->query($sql))
{
@@ -75,7 +77,8 @@
// On active le modele
$type='creditnote';
- $sql_del = "delete from ".MAIN_DB_PREFIX."document_model where nom =
'".$_GET["value"]."'";
+ $sql_del = "delete from ".MAIN_DB_PREFIX."document_model";
+ $sql_del .= " WHERE nom = '".$_GET["value"]."' AND type = '".$type."'";
$result1=$db->query($sql_del);
$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom,type) VALUES
('".$_GET["value"]."','".$type."')";
$result2=$db->query($sql);
@@ -242,5 +245,5 @@
$db->close();
-llxFooter('$Date: 2006/06/02 21:04:12 $ - $Revision: 1.12 $');
+llxFooter('$Date: 2006/06/09 09:03:41 $ - $Revision: 1.13 $');
?>
Index: commande.php
===================================================================
RCS file: /cvsroot/dolibarr/dolibarr/htdocs/admin/commande.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- commande.php 9 May 2006 11:33:01 -0000 1.20
+++ commande.php 9 Jun 2006 09:03:41 -0000 1.21
@@ -19,7 +19,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * $Id: commande.php,v 1.20 2006/05/09 11:33:01 hregis Exp $
+ * $Id: commande.php,v 1.21 2006/06/09 09:03:41 hregis Exp $
* $Source: /cvsroot/dolibarr/dolibarr/htdocs/admin/commande.php,v $
*/
@@ -27,7 +27,7 @@
\file htdocs/admin/commande.php
\ingroup commande
\brief Page d'administration-configuration du module
Commande
- \version $Revision: 1.20 $
+ \version $Revision: 1.21 $
*/
require("./pre.inc.php");
@@ -58,7 +58,9 @@
if ($_GET["action"] == 'del')
{
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE
nom='".$_GET["value"]."'";
+ $type='order';
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
+ $sql .= " WHERE nom = '".$_GET["value"]."' AND type = '".$type."'";
if ($db->query($sql))
{
@@ -78,7 +80,8 @@
// On active le modele
$type='order';
- $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model where nom =
'".$_GET["value"]."'";
+ $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
+ $sql_del .= " WHERE nom = '".$_GET["value"]."' AND type = '".$type."'";
$result1=$db->query($sql_del);
$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom,type) VALUES
('".$_GET["value"]."','".$type."')";
$result2=$db->query($sql);
@@ -300,5 +303,5 @@
print '</table>';
-llxFooter('$Date: 2006/05/09 11:33:01 $ - $Revision: 1.20 $');
+llxFooter('$Date: 2006/06/09 09:03:41 $ - $Revision: 1.21 $');
?>
Index: expedition.php
===================================================================
RCS file: /cvsroot/dolibarr/dolibarr/htdocs/admin/expedition.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- expedition.php 18 May 2006 20:45:07 -0000 1.24
+++ expedition.php 9 Jun 2006 09:03:41 -0000 1.25
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * $Id: expedition.php,v 1.24 2006/05/18 20:45:07 eldy Exp $
+ * $Id: expedition.php,v 1.25 2006/06/09 09:03:41 hregis Exp $
* $Source: /cvsroot/dolibarr/dolibarr/htdocs/admin/expedition.php,v $
*/
@@ -28,7 +28,7 @@
\file htdocs/admin/expedition.php
\ingroup expedition
\brief Page d'administration/configuration du module Expedition
- \version $Revision: 1.24 $
+ \version $Revision: 1.25 $
*/
require("./pre.inc.php");
@@ -58,7 +58,9 @@
if ($_GET["action"] == 'del')
{
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE
nom='".$_GET["value"]."'";
+ $type='shipping';
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
+ $sql .= " WHERE nom = '".$_GET["value"]."' AND type = '".$type."'";
if ($db->query($sql))
{
@@ -78,7 +80,8 @@
// On active le modele
$type='shipping';
- $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model where nom =
'".$_GET["value"]."'";
+ $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
+ $sql_del .= " WHERE nom = '".$_GET["value"]."' AND type = '".$type."'";
$result1=$db->query($sql_del);
$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom,type) VALUES
('".$_GET["value"]."','".$type."')";
$result2=$db->query($sql);
Index: facture.php
===================================================================
RCS file: /cvsroot/dolibarr/dolibarr/htdocs/admin/facture.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- facture.php 2 Jun 2006 21:04:12 -0000 1.61
+++ facture.php 9 Jun 2006 09:03:41 -0000 1.62
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * $Id: facture.php,v 1.61 2006/06/02 21:04:12 eldy Exp $
+ * $Id: facture.php,v 1.62 2006/06/09 09:03:41 hregis Exp $
* $Source: /cvsroot/dolibarr/dolibarr/htdocs/admin/facture.php,v $
*/
@@ -26,7 +26,7 @@
\file htdocs/admin/facture.php
\ingroup facture
\brief Page d'administration/configuration du module
Facture
- \version $Revision: 1.61 $
+ \version $Revision: 1.62 $
*/
require("./pre.inc.php");
@@ -58,7 +58,9 @@
if ($_GET["action"] == 'del')
{
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE
nom='".$_GET["value"]."'";
+ $type='invoice';
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
+ $sql .= " WHERE nom = '".$_GET["value"]."' AND type = '".$type."'";
if ($db->query($sql))
{
@@ -78,7 +80,8 @@
// On active le modele
$type='invoice';
- $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model where nom =
'".$_GET["value"]."'";
+ $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
+ $sql_del .= " WHERE nom = '".$_GET["value"]."' AND type = '".$type."'";
$result1=$db->query($sql_del);
$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom,type) VALUES
('".$_GET["value"]."','".$type."')";
$result2=$db->query($sql);
@@ -492,5 +495,5 @@
$db->close();
-llxFooter('$Date: 2006/06/02 21:04:12 $ - $Revision: 1.61 $');
+llxFooter('$Date: 2006/06/09 09:03:41 $ - $Revision: 1.62 $');
?>
Index: fichinter.php
===================================================================
RCS file: /cvsroot/dolibarr/dolibarr/htdocs/admin/fichinter.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- fichinter.php 6 May 2006 14:59:28 -0000 1.19
+++ fichinter.php 9 Jun 2006 09:03:41 -0000 1.20
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * $Id: fichinter.php,v 1.19 2006/05/06 14:59:28 eldy Exp $
+ * $Id: fichinter.php,v 1.20 2006/06/09 09:03:41 hregis Exp $
* $Source: /cvsroot/dolibarr/dolibarr/htdocs/admin/fichinter.php,v $
*/
@@ -26,7 +26,7 @@
\file htdocs/admin/fichinter.php
\ingroup fichinter
\brief Page d'administration/configuration du module
FicheInter
- \version $Revision: 1.19 $
+ \version $Revision: 1.20 $
*/
require("./pre.inc.php");
@@ -56,7 +56,9 @@
if ($_GET["action"] == 'del')
{
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE
nom='".$_GET["value"]."'";
+ $type='ficheinter';
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
+ $sql .= " WHERE nom = '".$_GET["value"]."' AND type = '".$type."'";
if ($db->query($sql))
{
@@ -76,7 +78,8 @@
// On active le modele
$type='ficheinter';
- $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model where nom =
'".$_GET["value"]."'";
+ $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
+ $sql_del .= " WHERE nom = '".$_GET["value"]."' AND type = '".$type."'";
$result1=$db->query($sql_del);
$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom,type) VALUES
('".$_GET["value"]."','".$type."')";
$result2=$db->query($sql);
@@ -214,5 +217,5 @@
$db->close();
-llxFooter('$Date: 2006/05/06 14:59:28 $ - $Revision: 1.19 $');
+llxFooter('$Date: 2006/06/09 09:03:41 $ - $Revision: 1.20 $');
?>
Index: fournisseur.php
===================================================================
RCS file: /cvsroot/dolibarr/dolibarr/htdocs/admin/fournisseur.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- fournisseur.php 6 May 2006 14:59:28 -0000 1.6
+++ fournisseur.php 9 Jun 2006 09:03:41 -0000 1.7
@@ -19,7 +19,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * $Id: fournisseur.php,v 1.6 2006/05/06 14:59:28 eldy Exp $
+ * $Id: fournisseur.php,v 1.7 2006/06/09 09:03:41 hregis Exp $
* $Source: /cvsroot/dolibarr/dolibarr/htdocs/admin/fournisseur.php,v $
*/
@@ -27,7 +27,7 @@
\file htdocs/admin/fournisseur.php
\ingroup fournisseur
\brief Page d'administration-configuration du module
Fournisseur
- \version $Revision: 1.6 $
+ \version $Revision: 1.7 $
*/
require("./pre.inc.php");
@@ -58,7 +58,9 @@
if ($_GET["action"] == 'del')
{
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE
nom='".$_GET["value"]."'";
+ $type='supplier_order';
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
+ $sql .= " WHERE nom = '".$_GET["value"]."' AND type = '".$type."'";
if ($db->query($sql))
{
@@ -78,7 +80,8 @@
// On active le modele
$type='supplier_order';
- $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model where nom =
'".$_GET["value"]."'";
+ $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
+ $sql_del .= " WHERE nom = '".$_GET["value"]."' AND type = '".$type."'";
$result1=$db->query($sql_del);
$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom,type) VALUES
('".$_GET["value"]."','".$type."')";
$result2=$db->query($sql);
@@ -300,5 +303,5 @@
print '</table>';
-llxFooter('$Date: 2006/05/06 14:59:28 $ - $Revision: 1.6 $');
+llxFooter('$Date: 2006/06/09 09:03:41 $ - $Revision: 1.7 $');
?>
Index: livraison.php
===================================================================
RCS file: /cvsroot/dolibarr/dolibarr/htdocs/admin/livraison.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- livraison.php 3 Jun 2006 23:29:21 -0000 1.12
+++ livraison.php 9 Jun 2006 09:03:41 -0000 1.13
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * $Id: livraison.php,v 1.12 2006/06/03 23:29:21 eldy Exp $
+ * $Id: livraison.php,v 1.13 2006/06/09 09:03:41 hregis Exp $
* $Source: /cvsroot/dolibarr/dolibarr/htdocs/admin/livraison.php,v $
*/
@@ -28,7 +28,7 @@
\file htdocs/admin/livraison.php
\ingroup livraison
\brief Page d'administration/configuration du module Livraison
- \version $Revision: 1.12 $
+ \version $Revision: 1.13 $
*/
require("./pre.inc.php");
@@ -58,7 +58,9 @@
if ($_GET["action"] == 'del')
{
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE
nom='".$_GET["value"]."'";
+ $type='delivery';
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
+ $sql .= " WHERE nom = '".$_GET["value"]."' AND type = '".$type."'";
if ($db->query($sql))
{
@@ -78,7 +80,8 @@
// On active le modele
$type='delivery';
- $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model where nom =
'".$_GET["value"]."'";
+ $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
+ $sql_del .= " WHERE nom = '".$_GET["value"]."' AND type = '".$type."'";
$result1=$db->query($sql_del);
$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom,type) VALUES
('".$_GET["value"]."','".$type."')";
$result2=$db->query($sql);
Index: propale.php
===================================================================
RCS file: /cvsroot/dolibarr/dolibarr/htdocs/admin/propale.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- propale.php 2 Jun 2006 20:47:27 -0000 1.41
+++ propale.php 9 Jun 2006 09:03:41 -0000 1.42
@@ -19,7 +19,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * $Id: propale.php,v 1.41 2006/06/02 20:47:27 eldy Exp $
+ * $Id: propale.php,v 1.42 2006/06/09 09:03:41 hregis Exp $
* $Source: /cvsroot/dolibarr/dolibarr/htdocs/admin/propale.php,v $
*/
@@ -27,7 +27,7 @@
\file htdocs/admin/propale.php
\ingroup propale
\brief Page d'administration/configuration du module
Propale
- \version $Revision: 1.41 $
+ \version $Revision: 1.42 $
*/
require("./pre.inc.php");
@@ -76,7 +76,9 @@
}
if ($_GET["action"] == 'del')
{
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE
nom='".$_GET["value"]."'";
+ $type='propal';
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
+ $sql .= " WHERE nom = '".$_GET["value"]."' AND type = '".$type."'";
if ($db->query($sql))
{
@@ -96,7 +98,8 @@
// On active le modele
$type='propal';
- $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model where nom =
'".$_GET["value"]."'";
+ $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
+ $sql_del .= " WHERE nom = '".$_GET["value"]."' AND type = '".$type."'";
$result1=$db->query($sql_del);
$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom,type) VALUES
('".$_GET["value"]."','".$type."')";
$result2=$db->query($sql);
@@ -400,5 +403,5 @@
$db->close();
-llxFooter('$Date: 2006/06/02 20:47:27 $ - $Revision: 1.41 $');
+llxFooter('$Date: 2006/06/09 09:03:41 $ - $Revision: 1.42 $');
?>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-cvs] dolibarr/htdocs/admin avoir.php commande.php ex...,
Regis Houssin <=