From b1378a8805b55dec6e97bb8f7acd9712a52abb65 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 11 Sep 2006 21:39:41 +0000
Subject: [PATCH] =?UTF-8?q?Je=20remet=20llx=5Fproduct=5Fprice=20car=20elle?=
=?UTF-8?q?=20est=20aussi=20utilis=E9e=20qd=20multiprix=20n'est=20pas=20ac?=
=?UTF-8?q?tif.=20Par=20contre=20je=20supprime=20la=20cr=E9ation=20dans=20?=
=?UTF-8?q?activation=20multiprix=20car=20elle=20doit=20toujours=20exister?=
=?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
htdocs/admin/produit.php | 38 +++++++++++-------------------
mysql/tables/llx_product_price.sql | 35 +++++++++++++++++++++++++++
2 files changed, 49 insertions(+), 24 deletions(-)
create mode 100644 mysql/tables/llx_product_price.sql
diff --git a/htdocs/admin/produit.php b/htdocs/admin/produit.php
index 33141bb1a15..1aaf2e01f5d 100644
--- a/htdocs/admin/produit.php
+++ b/htdocs/admin/produit.php
@@ -53,42 +53,32 @@ if ($_POST["action"] == 'multiprix')
$res=$db -> desc_table(MAIN_DB_PREFIX."product_price","price_level");
if(! $db -> fetch_row())
{
- // on ajoute le champ price_level dans la table product_price
- $field_desc = array('type'=>'TINYINT','value'=>'4','default'=>'1');
- if(! $db -> add_field(MAIN_DB_PREFIX."product_price","price_level",$field_desc,"after date_price"))
+ // on ajoute le champ price_level dans la table societe
+ if(! $db -> add_field(MAIN_DB_PREFIX."societe","price_level",$field_desc))
{
dolibarr_print_error($db);
print "<script language='JavaScript'>setTimeout(\"document.location='./produit.php'\",5000);</script>";
}
+ // on cr�e la table societe_prices
else
{
- // on ajoute le champ price_level dans la table societe
- if(! $db -> add_field(MAIN_DB_PREFIX."societe","price_level",$field_desc))
+ $table = MAIN_DB_PREFIX."societe_prices";
+ $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
+ $fields['fk_soc'] = array('type'=>'int','value'=>'11','null'=>'not null','default'=> '0');
+ $fields['tms'] = array('type'=>'timestamp','value'=>'14','null'=>'not null');
+ $fields['datec'] = array('type'=>'datetime','default'=> 'null');
+ $fields['fk_user_author'] = array('type'=>'int','value'=>'11','default'=> 'null');
+ $fields['price_level'] = array('type'=>'tinyint','value'=>'4','default'=> '1');
+ if(! $db -> create_table($table,$fields,"rowid","InnoDB"))
{
dolibarr_print_error($db);
print "<script language='JavaScript'>setTimeout(\"document.location='./produit.php'\",5000);</script>";
}
- // on cr�e la table societe_prices
else
{
- $table = MAIN_DB_PREFIX."societe_prices";
- $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
- $fields['fk_soc'] = array('type'=>'int','value'=>'11','null'=>'not null','default'=> '0');
- $fields['tms'] = array('type'=>'timestamp','value'=>'14','null'=>'not null');
- $fields['datec'] = array('type'=>'datetime','default'=> 'null');
- $fields['fk_user_author'] = array('type'=>'int','value'=>'11','default'=> 'null');
- $fields['price_level'] = array('type'=>'tinyint','value'=>'4','default'=> '1');
- if(! $db -> create_table($table,$fields,"rowid","InnoDB"))
- {
- dolibarr_print_error($db);
- print "<script language='JavaScript'>setTimeout(\"document.location='./produit.php'\",5000);</script>";
- }
- else
- {
- dolibarr_set_const($db, "PRODUIT_MULTIPRICES", $_POST["activate_multiprix"]);
- dolibarr_set_const($db, "PRODUIT_MULTIPRICES_LIMIT", "6");
- Header("Location: produit.php");
- }
+ dolibarr_set_const($db, "PRODUIT_MULTIPRICES", $_POST["activate_multiprix"]);
+ dolibarr_set_const($db, "PRODUIT_MULTIPRICES_LIMIT", "6");
+ Header("Location: produit.php");
}
}
}
diff --git a/mysql/tables/llx_product_price.sql b/mysql/tables/llx_product_price.sql
new file mode 100644
index 00000000000..928f440f1a8
--- /dev/null
+++ b/mysql/tables/llx_product_price.sql
@@ -0,0 +1,35 @@
+-- ============================================================================
+-- Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.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$
+-- $Source$
+--
+-- ============================================================================
+
+create table llx_product_price
+(
+ rowid integer AUTO_INCREMENT PRIMARY KEY,
+ tms timestamp,
+ fk_product integer NOT NULL,
+ date_price datetime NOT NULL,
+ price_level tinyint(4) NULL DEFAULT 1,
+ price double,
+ tva_tx double NOT NULL,
+ fk_user_author integer,
+ envente tinyint DEFAULT 1
+)type=innodb;
+
--
GitLab