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

Je remet llx_product_price car elle est aussi utilise qd multiprix n'est pas actif.

Browse Source 
Par contre je supprime la cration dans activation multiprix car elle doit toujours exister.
This commit is contained in:
Laurent Destailleur 2006-09-11 21:39:41 +00:00
parent 6a7ba4ca5e
commit b1378a8805
2 changed files with 49 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
htdocs/admin/produit.php
View File

@ -53,42 +53,32 @@ if ($_POST["action"] == 'multiprix')
$res=$db -> desc_table(MAIN_DB_PREFIX."product_price","price_level"); $res=$db -> desc_table(MAIN_DB_PREFIX."product_price","price_level");
if(! $db -> fetch_row()) if(! $db -> fetch_row())
{ {
// on ajoute le champ price_level dans la table product_price // on ajoute le champ price_level dans la table societe
$field_desc = array('type'=>'TINYINT','value'=>'4','default'=>'1'); if(! $db -> add_field(MAIN_DB_PREFIX."societe","price_level",$field_desc))
if(! $db -> add_field(MAIN_DB_PREFIX."product_price","price_level",$field_desc,"after date_price"))
{ {
dolibarr_print_error($db); dolibarr_print_error($db);
print "<script language='JavaScript'>setTimeout(\"document.location='./produit.php'\",5000);</script>"; print "<script language='JavaScript'>setTimeout(\"document.location='./produit.php'\",5000);</script>";
} }
// on crée la table societe_prices
else else
{ {
// on ajoute le champ price_level dans la table societe $table = MAIN_DB_PREFIX."societe_prices";
if(! $db -> add_field(MAIN_DB_PREFIX."societe","price_level",$field_desc)) $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); dolibarr_print_error($db);
print "<script language='JavaScript'>setTimeout(\"document.location='./produit.php'\",5000);</script>"; print "<script language='JavaScript'>setTimeout(\"document.location='./produit.php'\",5000);</script>";
} }
// on crée la table societe_prices
else else
{ {
$table = MAIN_DB_PREFIX."societe_prices"; dolibarr_set_const($db, "PRODUIT_MULTIPRICES", $_POST["activate_multiprix"]);
$fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment'); dolibarr_set_const($db, "PRODUIT_MULTIPRICES_LIMIT", "6");
$fields['fk_soc'] = array('type'=>'int','value'=>'11','null'=>'not null','default'=> '0'); Header("Location: produit.php");
$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");
}
} }
} }
} }

35
mysql/tables/llx_product_price.sql Normal file
View File

@ -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;