diff --git a/dev/fpdf/convert.php b/dev/fpdf/convert.php
index acaee3bf3dc555c5fe8cfa9a9194a55cf6fe593f..24738554cbd1c9444daf361b478f9f3740c9571e 100644
--- a/dev/fpdf/convert.php
+++ b/dev/fpdf/convert.php
@@ -1,6 +1,6 @@
#!/usr/bin/php
<?php
-/* Copyright (C) 2007 R�gis Houssin <regis@dolibarr.fr>
+/* Copyright (C) 2007 Regis Houssin <regis@dolibarr.fr>
*
* 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
@@ -15,16 +15,13 @@
* 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$
*/
/**
\file dev/fpdf/convert.php
\ingroup core
\brief Convert TTF for FPDF
- \version $Revision$
+ \version $Id$
*/
// Test si mode batch
@@ -45,7 +42,7 @@ $fontType = $argv[1];
$fontName = $argv[2];
$enc = $argv[3];
-//On v�rifie le type d'encodage
+//On v�rifie le type d'encodage
if ($enc)
{
$file='./makefont/'.strtolower($enc).'.map';
@@ -61,7 +58,7 @@ else
$enc = "cp1250";
}
-//On d�termine le type de la police
+//On d�termine le type de la police
if ($fontType == 1)
{
$font = './tmp/'.$fontName.'.ttf';
diff --git a/dev/load/generate-commande.php b/dev/load/generate-commande.php
index 16488da670cece8fae7c7f489f0714a60fb58719..de41b69f56e4475e1275711ece89af4850230912 100644
--- a/dev/load/generate-commande.php
+++ b/dev/load/generate-commande.php
@@ -16,16 +16,13 @@
* 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$
- *
* ATTENTION DE PAS EXECUTER CE SCRIPT SUR UNE INSTALLATION DE PRODUCTION
*/
/**
\file htdocs/dev/generate-commande.php
- \brief Script de g�n�ration de donn�es al�atoires pour les commandes
- \version $Revision$
+ \brief Script de generation de donnees aleatoires pour les commandes
+ \version $Id$
*/
// Test si mode batch
diff --git a/dev/load/generate-facture.php b/dev/load/generate-facture.php
index b2f6b3d81b6c42a0c9509265de32fdbbf328f8ab..5f76e208f67cfba927f9e9608a03a9003bfb1bb7 100644
--- a/dev/load/generate-facture.php
+++ b/dev/load/generate-facture.php
@@ -15,16 +15,13 @@
* 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$
- *
* ATTENTION DE PAS EXECUTER CE SCRIPT SUR UNE INSTALLATION DE PRODUCTION
*/
/**
\file htdocs/dev/generate-facture.php
- \brief Script de g�n�ration de donn�es al�atoires pour les factures
- \version $Revision$
+ \brief Script de generation de donnees aleatoires pour les factures
+ \version $Id$
*/
// Test si mode batch
diff --git a/dev/load/generate-produit.php b/dev/load/generate-produit.php
index 3b728c114e3fef7a1998d62829b84ba37572ba83..4c8240b66692736e6ee39c9bfe31adee6d0a3d69 100644
--- a/dev/load/generate-produit.php
+++ b/dev/load/generate-produit.php
@@ -16,16 +16,13 @@
* 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$
- *
* ATTENTION DE PAS EXECUTER CE SCRIPT SUR UNE INSTALLATION DE PRODUCTION
*/
/**
\file htdocs/dev/generate-produit.php
- \brief Script de g�n�ration de donn�es al�atoires pour les produits
- \version $Revision$
+ \brief Script de generation de donnees aleatoires pour les produits
+ \version $Id$
*/
// Test si mode batch
@@ -67,7 +64,7 @@ if ($db->query($sql)) { $num = $db->num_rows(); $i = 0;
while ($i < $num) { $row = $db->fetch_row($i); $commandesid[$i] = $row[0]; $i++; } } else { print "err"; }
-print "G�n�re ".GEN_NUMBER_PRODUIT." produits\n";
+print "G�n�re ".GEN_NUMBER_PRODUIT." produits\n";
for ($s = 0 ; $s < GEN_NUMBER_PRODUIT ; $s++)
{
print "Produit ".$s;
diff --git a/dev/load/generate-propale.php b/dev/load/generate-propale.php
index 8d26c74c6e26e53c5f2a4aa448b0305753e21ef5..51ed44779bd1a7179a59fdc3fb45d1ea03481cda 100644
--- a/dev/load/generate-propale.php
+++ b/dev/load/generate-propale.php
@@ -16,16 +16,13 @@
* 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$
- *
* ATTENTION DE PAS EXECUTER CE SCRIPT SUR UNE INSTALLATION DE PRODUCTION
*/
/**
\file htdocs/dev/generate-propale.php
- \brief Script de g�n�ration de donn�es al�atoires pour les propales
- \version $Revision$
+ \brief Script de generation de donnees aleatoires pour les propales
+ \version $Id$
*/
// Test si mode batch
diff --git a/dev/load/generate-societe.php b/dev/load/generate-societe.php
index 25c2a294cc3abcab311aa48d384bae3c74ba3f69..1430bea12fb04e9e1c75125e81424d28a2ce04b6 100644
--- a/dev/load/generate-societe.php
+++ b/dev/load/generate-societe.php
@@ -16,16 +16,13 @@
* 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$
- *
* ATTENTION DE PAS EXECUTER CE SCRIPT SUR UNE INSTALLATION DE PRODUCTION
*/
/**
\file htdocs/dev/generate-societe.php
- \brief Script de g�n�ration de donn�es al�atoires pour les societes
- \version $Revision$
+ \brief Script de generation de donnees aleatoires pour les societes
+ \version $Id$
*/
// Test si mode batch
@@ -45,7 +42,7 @@ include_once(DOL_DOCUMENT_ROOT."/product.class.php");
include_once(DOL_DOCUMENT_ROOT."/paiement.class.php");
include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php");
-$villes = array("Auray","Baden","Vannes","Pirouville","Haguenau","Souffelweiersheim","Illkirch-Graffenstaden","Lauterbourg","Picauville","Sainte-M�re Eglise","Le Bono");
+$villes = array("Auray","Baden","Vannes","Pirouville","Haguenau","Souffelweiersheim","Illkirch-Graffenstaden","Lauterbourg","Picauville","Sainte-M�re Eglise","Le Bono");
$prenoms = array("Joe","Marc","Steve","Laurent","Nico","Isabelle","Dorothee","Saby","Brigitte","Karine","Jose-Anne","Celine","Virginie");
@@ -71,12 +68,12 @@ while ($i < $num) { $row = $db->fetch_row($i); $commandesid[$i] = $row[0];
-print "G�n�re ".GEN_NUMBER_SOCIETE." soci�t�s\n";
+print "G�n�re ".GEN_NUMBER_SOCIETE." soci�t�s\n";
for ($s = 0 ; $s < GEN_NUMBER_SOCIETE ; $s++)
{
- print "Soci�t� $s\n";
+ print "Soci�t� $s\n";
$soc = new Societe($db);
- $soc->nom = "Soci�t� num ".time()."$s";
+ $soc->nom = "Soci�t� num ".time()."$s";
$soc->ville = $villes[rand(0,sizeof($villes)-1)];
$soc->client = rand(1,2); // Une societe sur 2 est prospect, l'autre client
$soc->fournisseur = rand(0,1); // Une societe sur 2 est fournisseur
@@ -86,13 +83,13 @@ for ($s = 0 ; $s < GEN_NUMBER_SOCIETE ; $s++)
// Un client sur 10 a une remise de 5%
$user_remise=rand(1,10); if ($user_remise==10) $soc->remise_client=5;
print "> client=".$soc->client.", fournisseur=".$soc->fournisseur.", remise=".$soc->remise_client."\n";
- $soc->note='Soci�t� fictive g�n�r�e par le script generate-societe.php';
+ $soc->note='Soci�t� fictive g�n�r�e par le script generate-societe.php';
$socid = $soc->create();
if ($socid >= 0)
{
$rand = rand(1,4);
- print "> G�n�re $rand contact\n";
+ print "> G�n�re $rand contact\n";
for ($c = 0 ; $c < $rand ; $c++)
{
$contact = new Contact($db);
diff --git a/htdocs/boxes.php b/htdocs/boxes.php
index 8341c6c8fa99813e460eb307316c8a5f31c1d251..4d580f437d46032559127daf0fbd496704596273 100644
--- a/htdocs/boxes.php
+++ b/htdocs/boxes.php
@@ -16,9 +16,6 @@
* 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$
*/
/**
@@ -26,7 +23,7 @@
\brief Fichier de la classe boxes
\author Rodolphe Qiedeville
\author Laurent Destailleur
- \version $Revision$
+ \version $Id$
*/
diff --git a/htdocs/searchpostalcode.php b/htdocs/searchpostalcode.php
index 070b6277e297486dd1fb69e0a4c026c2b3512087..2bc30494276d19deb23d2c6ee439fd0b69d527ae 100644
--- a/htdocs/searchpostalcode.php
+++ b/htdocs/searchpostalcode.php
@@ -16,9 +16,6 @@
* 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$
- *
* ***************************************************************************
* File : searchpostalcode.php
* Author : Eric SEIGNE
@@ -30,8 +27,7 @@
* Description:
* ------------
* @version $Id$
- * @source $Source$
- * @revision $Revision$
+ * @revision $Id$
* @author Eric Seigne
* @project
* @copyright Eric Seigne 13/06/2005
@@ -41,7 +37,7 @@
/**
\file htdocs/searchpostalcode.php
\ingroup societe
- \brief Recherche de la ville correspondant au code postal saisi. 1er tour on cherche dans la table societ�, si on a deux clients dans la m�me ville c'est direct. Si jamais �a ne donne rien alors on lance la recherche dans la table des codes postaux.
+ \brief Recherche de la ville correspondant au code postal saisi. 1er tour on cherche dans la table societ�, si on a deux clients dans la m�me ville c'est direct. Si jamais �a ne donne rien alors on lance la recherche dans la table des codes postaux.
\version $Revision$
*/
require("pre.inc.php");
@@ -69,7 +65,7 @@ function run_request($table)
}
-// S�curit� acc�s client
+// S�curit� acc�s client
if ($user->societe_id > 0)
{
$_GET["action"] = '';
@@ -129,7 +125,7 @@ if($num == 0)
$num=$db->num_rows();
}
-// Si on n'a qu'un seul r�sultat on switche direct et on remplit le formulaire
+// Si on n'a qu'un seul r�sultat on switche direct et on remplit le formulaire
if($num <= 1)
{
$obj = $db->fetch_object($result);
diff --git a/htdocs/service.class.php b/htdocs/service.class.php
index 07cd5fc84fcdae4b3bf04b7404fe44d73eed862c..5d5fbbaec218f62286e248b86a7490e8e89bb8ca 100644
--- a/htdocs/service.class.php
+++ b/htdocs/service.class.php
@@ -15,25 +15,20 @@
* 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$
- *
*/
/**
- \file htdocs/service.class.php
- \ingroup service
- \brief Fichier de la classe des services pr�d�finis
- \version $Revision$
-*/
+ * \file htdocs/service.class.php
+ * \ingroup service
+ * \brief Fichier de la classe des services predefinis
+ * \version $Id$
+ */
/**
- \class Service
- \brief Classe permettant la gestion des services pr�d�finis
-*/
-
+ * \class Service
+ * \brief Classe permettant la gestion des services predefinis
+ */
class Service
{
var $db;
diff --git a/mysql/functions/functions.sql b/mysql/functions/functions.sql
index 7f9e64ed9d64560c9af00ecce18e98f7a4eb85c2..655848a50aed60d84f3b04b7305713e69b640375 100644
--- a/mysql/functions/functions.sql
+++ b/mysql/functions/functions.sql
@@ -16,7 +16,6 @@
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
--
-- $Id$
--- $Source$
--
-- ============================================================================
diff --git a/mysql/migration/2.0.0-2.1.0.sql b/mysql/migration/2.0.0-2.1.0.sql
index d82c8dc7f24bb5ed3a70721a932ae77d1f1a037d..4ecf8bf733736f5eaf235fe389c8b85b46f34455 100644
--- a/mysql/migration/2.0.0-2.1.0.sql
+++ b/mysql/migration/2.0.0-2.1.0.sql
@@ -1,10 +1,9 @@
--
-- $Id$
--- $Source$
-- $Revision$
--
--- Attention � l ordre des requetes.
--- Ce fichier doit �tre charg� sur une version 2.0.0
+-- Attention a l ordre des requetes.
+-- Ce fichier doit etre charge sur une version 2.0.0
-- sans AUCUNE erreur ni warning
--
@@ -75,7 +74,7 @@ ALTER TABLE llx_product ADD COLUMN canvas varchar(15) DEFAULT '';
ALTER TABLE llx_stock_mouvement ADD COLUMN price FLOAT(13,4) DEFAULT 0;
-insert into llx_cond_reglement(rowid, code, sortorder, active, libelle, libelle_facture, fdm, nbjour) values (6,'PROFORMA', 6,1, 'Proforma','R�glement avant livraison',0,0);
+insert into llx_cond_reglement(rowid, code, sortorder, active, libelle, libelle_facture, fdm, nbjour) values (6,'PROFORMA', 6,1, 'Proforma','R�glement avant livraison',0,0);
alter table llx_cond_reglement add (decalage smallint(6) default 0);
@@ -90,7 +89,7 @@ ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label);
alter table llx_c_actioncomm add module varchar(16) DEFAULT NULL after libelle;
delete from llx_c_actioncomm where id in (1,2,3,4,5,8,9,50);
-insert into llx_c_actioncomm (id, code, type, libelle, module) values ( 1, 'AC_TEL', 'system', 'Appel T�l�phonique' ,NULL);
+insert into llx_c_actioncomm (id, code, type, libelle, module) values ( 1, 'AC_TEL', 'system', 'Appel T�l�phonique' ,NULL);
insert into llx_c_actioncomm (id, code, type, libelle, module) values ( 2, 'AC_FAX', 'system', 'Envoi Fax' ,NULL);
insert into llx_c_actioncomm (id, code, type, libelle, module) values ( 3, 'AC_PROP', 'system', 'Envoi Proposition' ,'propal');
insert into llx_c_actioncomm (id, code, type, libelle, module) values ( 4, 'AC_EMAIL','system', 'Envoi Email' ,NULL);
@@ -273,16 +272,16 @@ insert into llx_c_pays (rowid,code,libelle) values (9, 'CN', 'Chine' )
insert into llx_c_pays (rowid,code,libelle) values (10, 'TN', 'Tunisie' );
insert into llx_c_pays (rowid,code,libelle) values (11, 'US', 'Etats Unis' );
insert into llx_c_pays (rowid,code,libelle) values (12, 'MA', 'Maroc' );
-insert into llx_c_pays (rowid,code,libelle) values (13, 'DZ', 'Alg�rie' );
+insert into llx_c_pays (rowid,code,libelle) values (13, 'DZ', 'Alg�rie' );
insert into llx_c_pays (rowid,code,libelle) values (14, 'CA', 'Canada' );
insert into llx_c_pays (rowid,code,libelle) values (15, 'TG', 'Togo' );
insert into llx_c_pays (rowid,code,libelle) values (16, 'GA', 'Gabon' );
insert into llx_c_pays (rowid,code,libelle) values (17, 'NL', 'Pays Bas' );
insert into llx_c_pays (rowid,code,libelle) values (18, 'HU', 'Hongrie' );
insert into llx_c_pays (rowid,code,libelle) values (19, 'RU', 'Russie' );
-insert into llx_c_pays (rowid,code,libelle) values (20, 'SE', 'Su�de' );
-insert into llx_c_pays (rowid,code,libelle) values (21, 'CI', 'C�te d\'Ivoire' );
-insert into llx_c_pays (rowid,code,libelle) values (22, 'SN', 'S�n�gal' );
+insert into llx_c_pays (rowid,code,libelle) values (20, 'SE', 'Su�de' );
+insert into llx_c_pays (rowid,code,libelle) values (21, 'CI', 'C�te d\'Ivoire' );
+insert into llx_c_pays (rowid,code,libelle) values (22, 'SN', 'S�n�gal' );
insert into llx_c_pays (rowid,code,libelle) values (23, 'AR', 'Argentine' );
insert into llx_c_pays (rowid,code,libelle) values (24, 'CM', 'Cameroun' );
insert into llx_c_pays (rowid,code,libelle) values (25, 'PT', 'Portugal' );
@@ -293,31 +292,31 @@ insert into llx_c_pays (rowid,code,libelle) values (29, 'SG', 'Singapoure' )
insert into llx_c_pays (rowid,code,libelle) values (30, 'AF', 'Afghanistan' );
insert into llx_c_pays (rowid,code,libelle) values (31, 'AX', 'Iles Aland' );
insert into llx_c_pays (rowid,code,libelle) values (32, 'AL', 'Albanie' );
-insert into llx_c_pays (rowid,code,libelle) values (33, 'AS', 'Samoa am�ricaines');
+insert into llx_c_pays (rowid,code,libelle) values (33, 'AS', 'Samoa am�ricaines');
insert into llx_c_pays (rowid,code,libelle) values (34, 'AD', 'Andorre' );
insert into llx_c_pays (rowid,code,libelle) values (35, 'AO', 'Angola' );
insert into llx_c_pays (rowid,code,libelle) values (36, 'AI', 'Anguilla' );
insert into llx_c_pays (rowid,code,libelle) values (37, 'AQ', 'Antarctique' );
insert into llx_c_pays (rowid,code,libelle) values (38, 'AG', 'Antigua-et-Barbuda');
-insert into llx_c_pays (rowid,code,libelle) values (39, 'AM', 'Arm�nie' );
+insert into llx_c_pays (rowid,code,libelle) values (39, 'AM', 'Arm�nie' );
insert into llx_c_pays (rowid,code,libelle) values (40, 'AW', 'Aruba' );
insert into llx_c_pays (rowid,code,libelle) values (41, 'AT', 'Autriche' );
-insert into llx_c_pays (rowid,code,libelle) values (42, 'AZ', 'Azerba�djan' );
+insert into llx_c_pays (rowid,code,libelle) values (42, 'AZ', 'Azerba�djan' );
insert into llx_c_pays (rowid,code,libelle) values (43, 'BS', 'Bahamas' );
-insert into llx_c_pays (rowid,code,libelle) values (44, 'BH', 'Bahre�n' );
+insert into llx_c_pays (rowid,code,libelle) values (44, 'BH', 'Bahre�n' );
insert into llx_c_pays (rowid,code,libelle) values (45, 'BD', 'Bangladesh' );
insert into llx_c_pays (rowid,code,libelle) values (46, 'BB', 'Barbade' );
-insert into llx_c_pays (rowid,code,libelle) values (47, 'BY', 'Bi�lorussie' );
+insert into llx_c_pays (rowid,code,libelle) values (47, 'BY', 'Bi�lorussie' );
insert into llx_c_pays (rowid,code,libelle) values (48, 'BZ', 'Belize' );
-insert into llx_c_pays (rowid,code,libelle) values (49, 'BJ', 'B�nin' );
+insert into llx_c_pays (rowid,code,libelle) values (49, 'BJ', 'B�nin' );
insert into llx_c_pays (rowid,code,libelle) values (50, 'BM', 'Bermudes' );
insert into llx_c_pays (rowid,code,libelle) values (51, 'BT', 'Bhoutan' );
insert into llx_c_pays (rowid,code,libelle) values (52, 'BO', 'Bolivie' );
-insert into llx_c_pays (rowid,code,libelle) values (53, 'BA', 'Bosnie-Herz�govine');
+insert into llx_c_pays (rowid,code,libelle) values (53, 'BA', 'Bosnie-Herz�govine');
insert into llx_c_pays (rowid,code,libelle) values (54, 'BW', 'Botswana' );
insert into llx_c_pays (rowid,code,libelle) values (55, 'BV', 'Ile Bouvet' );
-insert into llx_c_pays (rowid,code,libelle) values (56, 'BR', 'Br�sil' );
-insert into llx_c_pays (rowid,code,libelle) values (57, 'IO', 'Territoire britannique de l\'Oc�an Indien');
+insert into llx_c_pays (rowid,code,libelle) values (56, 'BR', 'Br�sil' );
+insert into llx_c_pays (rowid,code,libelle) values (57, 'IO', 'Territoire britannique de l\'Oc�an Indien');
insert into llx_c_pays (rowid,code,libelle) values (58, 'BN', 'Brunei' );
insert into llx_c_pays (rowid,code,libelle) values (59, 'BG', 'Bulgarie' );
insert into llx_c_pays (rowid,code,libelle) values (60, 'BF', 'Burkina Faso' );
@@ -325,7 +324,7 @@ insert into llx_c_pays (rowid,code,libelle) values (61, 'BI', 'Burundi' )
insert into llx_c_pays (rowid,code,libelle) values (62, 'KH', 'Cambodge' );
insert into llx_c_pays (rowid,code,libelle) values (63, 'CV', 'Cap-Vert' );
insert into llx_c_pays (rowid,code,libelle) values (64, 'KY', 'Iles Cayman' );
-insert into llx_c_pays (rowid,code,libelle) values (65, 'CF', 'R�publique centrafricaine');
+insert into llx_c_pays (rowid,code,libelle) values (65, 'CF', 'R�publique centrafricaine');
insert into llx_c_pays (rowid,code,libelle) values (66, 'TD', 'Tchad' );
insert into llx_c_pays (rowid,code,libelle) values (67, 'CL', 'Chili' );
insert into llx_c_pays (rowid,code,libelle) values (68, 'CX', 'Ile Christmas' );
@@ -333,64 +332,64 @@ insert into llx_c_pays (rowid,code,libelle) values (69, 'CC', 'Iles des Cocos (K
insert into llx_c_pays (rowid,code,libelle) values (70, 'CO', 'Colombie' );
insert into llx_c_pays (rowid,code,libelle) values (71, 'KM', 'Comores' );
insert into llx_c_pays (rowid,code,libelle) values (72, 'CG', 'Congo' );
-insert into llx_c_pays (rowid,code,libelle) values (73, 'CD', 'R�publique d�mocratique du Congo');
+insert into llx_c_pays (rowid,code,libelle) values (73, 'CD', 'R�publique d�mocratique du Congo');
insert into llx_c_pays (rowid,code,libelle) values (74, 'CK', 'Iles Cook' );
insert into llx_c_pays (rowid,code,libelle) values (75, 'CR', 'Costa Rica' );
insert into llx_c_pays (rowid,code,libelle) values (76, 'HR', 'Croatie' );
insert into llx_c_pays (rowid,code,libelle) values (77, 'CU', 'Cuba' );
insert into llx_c_pays (rowid,code,libelle) values (78, 'CY', 'Chypre' );
-insert into llx_c_pays (rowid,code,libelle) values (79, 'CZ', 'R�publique Tch�que');
+insert into llx_c_pays (rowid,code,libelle) values (79, 'CZ', 'R�publique Tch�que');
insert into llx_c_pays (rowid,code,libelle) values (80, 'DK', 'Danemark' );
insert into llx_c_pays (rowid,code,libelle) values (81, 'DJ', 'Djibouti' );
insert into llx_c_pays (rowid,code,libelle) values (82, 'DM', 'Dominique' );
-insert into llx_c_pays (rowid,code,libelle) values (83, 'DO', 'R�publique Dominicaine');
+insert into llx_c_pays (rowid,code,libelle) values (83, 'DO', 'R�publique Dominicaine');
insert into llx_c_pays (rowid,code,libelle) values (84, 'EC', 'Equateur' );
insert into llx_c_pays (rowid,code,libelle) values (85, 'EG', 'Egypte' );
insert into llx_c_pays (rowid,code,libelle) values (86, 'SV', 'Salvador' );
-insert into llx_c_pays (rowid,code,libelle) values (87, 'GQ', 'Guin�e Equatoriale');
-insert into llx_c_pays (rowid,code,libelle) values (88, 'ER', 'Erythr�e' );
+insert into llx_c_pays (rowid,code,libelle) values (87, 'GQ', 'Guin�e Equatoriale');
+insert into llx_c_pays (rowid,code,libelle) values (88, 'ER', 'Erythr�e' );
insert into llx_c_pays (rowid,code,libelle) values (89, 'EE', 'Estonie' );
insert into llx_c_pays (rowid,code,libelle) values (90, 'ET', 'Ethiopie' );
insert into llx_c_pays (rowid,code,libelle) values (91, 'FK', 'Iles Falkland' );
-insert into llx_c_pays (rowid,code,libelle) values (92, 'FO', 'Iles F�ro�' );
+insert into llx_c_pays (rowid,code,libelle) values (92, 'FO', 'Iles F�ro�' );
insert into llx_c_pays (rowid,code,libelle) values (93, 'FJ', 'Iles Fidji' );
insert into llx_c_pays (rowid,code,libelle) values (94, 'FI', 'Finlande' );
-insert into llx_c_pays (rowid,code,libelle) values (95, 'GF', 'Guyane fran�aise');
-insert into llx_c_pays (rowid,code,libelle) values (96, 'PF', 'Polyn�sie fran�aise');
-insert into llx_c_pays (rowid,code,libelle) values (97, 'TF', 'Terres australes fran�aises');
+insert into llx_c_pays (rowid,code,libelle) values (95, 'GF', 'Guyane fran�aise');
+insert into llx_c_pays (rowid,code,libelle) values (96, 'PF', 'Polyn�sie fran�aise');
+insert into llx_c_pays (rowid,code,libelle) values (97, 'TF', 'Terres australes fran�aises');
insert into llx_c_pays (rowid,code,libelle) values (98, 'GM', 'Gambie' );
-insert into llx_c_pays (rowid,code,libelle) values (99, 'GE', 'G�orgie' );
+insert into llx_c_pays (rowid,code,libelle) values (99, 'GE', 'G�orgie' );
insert into llx_c_pays (rowid,code,libelle) values (100, 'GH', 'Ghana' );
insert into llx_c_pays (rowid,code,libelle) values (101, 'GI', 'Gibraltar' );
-insert into llx_c_pays (rowid,code,libelle) values (102, 'GR', 'Gr�ce' );
+insert into llx_c_pays (rowid,code,libelle) values (102, 'GR', 'Gr�ce' );
insert into llx_c_pays (rowid,code,libelle) values (103, 'GL', 'Groenland' );
insert into llx_c_pays (rowid,code,libelle) values (104, 'GD', 'Grenade' );
insert into llx_c_pays (rowid,code,libelle) values (105, 'GP', 'Guadeloupe' );
insert into llx_c_pays (rowid,code,libelle) values (106, 'GU', 'Guam' );
insert into llx_c_pays (rowid,code,libelle) values (107, 'GT', 'Guatemala' );
-insert into llx_c_pays (rowid,code,libelle) values (108, 'GN', 'Guin�e' );
-insert into llx_c_pays (rowid,code,libelle) values (109, 'GW', 'Guin�e-Bissao' );
+insert into llx_c_pays (rowid,code,libelle) values (108, 'GN', 'Guin�e' );
+insert into llx_c_pays (rowid,code,libelle) values (109, 'GW', 'Guin�e-Bissao' );
insert into llx_c_pays (rowid,code,libelle) values (110, 'GY', 'Guyana' );
-insert into llx_c_pays (rowid,code,libelle) values (111, 'HT', 'Ha�ti' );
+insert into llx_c_pays (rowid,code,libelle) values (111, 'HT', 'Ha�ti' );
insert into llx_c_pays (rowid,code,libelle) values (112, 'HM', 'Iles Heard et McDonald');
-insert into llx_c_pays (rowid,code,libelle) values (113, 'VA', 'Saint-Si�ge (Vatican)');
+insert into llx_c_pays (rowid,code,libelle) values (113, 'VA', 'Saint-Si�ge (Vatican)');
insert into llx_c_pays (rowid,code,libelle) values (114, 'HN', 'Honduras' );
insert into llx_c_pays (rowid,code,libelle) values (115, 'HK', 'Hong Kong' );
insert into llx_c_pays (rowid,code,libelle) values (116, 'IS', 'Islande' );
insert into llx_c_pays (rowid,code,libelle) values (117, 'IN', 'Inde' );
-insert into llx_c_pays (rowid,code,libelle) values (118, 'ID', 'Indon�sie' );
+insert into llx_c_pays (rowid,code,libelle) values (118, 'ID', 'Indon�sie' );
insert into llx_c_pays (rowid,code,libelle) values (119, 'IR', 'Iran' );
insert into llx_c_pays (rowid,code,libelle) values (120, 'IQ', 'Iraq' );
-insert into llx_c_pays (rowid,code,libelle) values (121, 'IL', 'Isra�l' );
-insert into llx_c_pays (rowid,code,libelle) values (122, 'JM', 'Jama�que' );
+insert into llx_c_pays (rowid,code,libelle) values (121, 'IL', 'Isra�l' );
+insert into llx_c_pays (rowid,code,libelle) values (122, 'JM', 'Jama�que' );
insert into llx_c_pays (rowid,code,libelle) values (123, 'JP', 'Japon' );
insert into llx_c_pays (rowid,code,libelle) values (124, 'JO', 'Jordanie' );
insert into llx_c_pays (rowid,code,libelle) values (125, 'KZ', 'Kazakhstan' );
insert into llx_c_pays (rowid,code,libelle) values (126, 'KE', 'Kenya' );
insert into llx_c_pays (rowid,code,libelle) values (127, 'KI', 'Kiribati' );
-insert into llx_c_pays (rowid,code,libelle) values (128, 'KP', 'Cor�e du Nord' );
-insert into llx_c_pays (rowid,code,libelle) values (129, 'KR', 'Cor�e du Sud' );
-insert into llx_c_pays (rowid,code,libelle) values (130, 'KW', 'Kowe�t' );
+insert into llx_c_pays (rowid,code,libelle) values (128, 'KP', 'Cor�e du Nord' );
+insert into llx_c_pays (rowid,code,libelle) values (129, 'KR', 'Cor�e du Sud' );
+insert into llx_c_pays (rowid,code,libelle) values (130, 'KW', 'Kowe�t' );
insert into llx_c_pays (rowid,code,libelle) values (131, 'KG', 'Kirghizistan' );
insert into llx_c_pays (rowid,code,libelle) values (132, 'LA', 'Laos' );
insert into llx_c_pays (rowid,code,libelle) values (133, 'LV', 'Lettonie' );
@@ -402,7 +401,7 @@ insert into llx_c_pays (rowid,code,libelle) values (138, 'LI', 'Liechtenstein' )
insert into llx_c_pays (rowid,code,libelle) values (139, 'LT', 'Lituanie' );
insert into llx_c_pays (rowid,code,libelle) values (140, 'LU', 'Luxembourg' );
insert into llx_c_pays (rowid,code,libelle) values (141, 'MO', 'Macao' );
-insert into llx_c_pays (rowid,code,libelle) values (142, 'MK', 'ex-R�publique yougoslave de Mac�doine');
+insert into llx_c_pays (rowid,code,libelle) values (142, 'MK', 'ex-R�publique yougoslave de Mac�doine');
insert into llx_c_pays (rowid,code,libelle) values (143, 'MG', 'Madagascar' );
insert into llx_c_pays (rowid,code,libelle) values (144, 'MW', 'Malawi' );
insert into llx_c_pays (rowid,code,libelle) values (145, 'MY', 'Malaisie' );
@@ -415,7 +414,7 @@ insert into llx_c_pays (rowid,code,libelle) values (151, 'MR', 'Mauritanie' )
insert into llx_c_pays (rowid,code,libelle) values (152, 'MU', 'Maurice' );
insert into llx_c_pays (rowid,code,libelle) values (153, 'YT', 'Mayotte' );
insert into llx_c_pays (rowid,code,libelle) values (154, 'MX', 'Mexique' );
-insert into llx_c_pays (rowid,code,libelle) values (155, 'FM', 'Micron�sie' );
+insert into llx_c_pays (rowid,code,libelle) values (155, 'FM', 'Micron�sie' );
insert into llx_c_pays (rowid,code,libelle) values (156, 'MD', 'Moldavie' );
insert into llx_c_pays (rowid,code,libelle) values (157, 'MN', 'Mongolie' );
insert into llx_c_pays (rowid,code,libelle) values (158, 'MS', 'Monserrat' );
@@ -423,82 +422,82 @@ insert into llx_c_pays (rowid,code,libelle) values (159, 'MZ', 'Mozambique' )
insert into llx_c_pays (rowid,code,libelle) values (160, 'MM', 'Birmanie' );
insert into llx_c_pays (rowid,code,libelle) values (161, 'NA', 'Namibie' );
insert into llx_c_pays (rowid,code,libelle) values (162, 'NR', 'Nauru' );
-insert into llx_c_pays (rowid,code,libelle) values (163, 'NP', 'N�pal' );
-insert into llx_c_pays (rowid,code,libelle) values (164, 'AN', 'Antilles n�erlandaises');
-insert into llx_c_pays (rowid,code,libelle) values (165, 'NC', 'Nouvelle-Cal�donie');
-insert into llx_c_pays (rowid,code,libelle) values (166, 'NZ', 'Nouvelle-Z�lande');
+insert into llx_c_pays (rowid,code,libelle) values (163, 'NP', 'N�pal' );
+insert into llx_c_pays (rowid,code,libelle) values (164, 'AN', 'Antilles n�erlandaises');
+insert into llx_c_pays (rowid,code,libelle) values (165, 'NC', 'Nouvelle-Cal�donie');
+insert into llx_c_pays (rowid,code,libelle) values (166, 'NZ', 'Nouvelle-Z�lande');
insert into llx_c_pays (rowid,code,libelle) values (167, 'NI', 'Nicaragua' );
insert into llx_c_pays (rowid,code,libelle) values (168, 'NE', 'Niger' );
insert into llx_c_pays (rowid,code,libelle) values (169, 'NG', 'Nigeria' );
-insert into llx_c_pays (rowid,code,libelle) values (170, 'NU', 'Niou�' );
+insert into llx_c_pays (rowid,code,libelle) values (170, 'NU', 'Niou�' );
insert into llx_c_pays (rowid,code,libelle) values (171, 'NF', 'Ile Norfolk' );
insert into llx_c_pays (rowid,code,libelle) values (172, 'MP', 'Mariannes du Nord');
-insert into llx_c_pays (rowid,code,libelle) values (173, 'NO', 'Norv�ge' );
+insert into llx_c_pays (rowid,code,libelle) values (173, 'NO', 'Norv�ge' );
insert into llx_c_pays (rowid,code,libelle) values (174, 'OM', 'Oman' );
insert into llx_c_pays (rowid,code,libelle) values (175, 'PK', 'Pakistan' );
insert into llx_c_pays (rowid,code,libelle) values (176, 'PW', 'Palaos' );
-insert into llx_c_pays (rowid,code,libelle) values (177, 'PS', 'territoire Palestinien Occup�');
+insert into llx_c_pays (rowid,code,libelle) values (177, 'PS', 'territoire Palestinien Occup�');
insert into llx_c_pays (rowid,code,libelle) values (178, 'PA', 'Panama' );
-insert into llx_c_pays (rowid,code,libelle) values (179, 'PG', 'Papouasie-Nouvelle-Guin�e');
+insert into llx_c_pays (rowid,code,libelle) values (179, 'PG', 'Papouasie-Nouvelle-Guin�e');
insert into llx_c_pays (rowid,code,libelle) values (180, 'PY', 'Paraguay' );
-insert into llx_c_pays (rowid,code,libelle) values (181, 'PE', 'P�rou' );
+insert into llx_c_pays (rowid,code,libelle) values (181, 'PE', 'P�rou' );
insert into llx_c_pays (rowid,code,libelle) values (182, 'PH', 'Philippines' );
insert into llx_c_pays (rowid,code,libelle) values (183, 'PN', 'Iles Pitcairn' );
insert into llx_c_pays (rowid,code,libelle) values (184, 'PL', 'Pologne' );
insert into llx_c_pays (rowid,code,libelle) values (185, 'PR', 'Porto Rico' );
insert into llx_c_pays (rowid,code,libelle) values (186, 'QA', 'Qatar' );
-insert into llx_c_pays (rowid,code,libelle) values (187, 'RE', 'R�union' );
+insert into llx_c_pays (rowid,code,libelle) values (187, 'RE', 'R�union' );
insert into llx_c_pays (rowid,code,libelle) values (188, 'RO', 'Roumanie' );
insert into llx_c_pays (rowid,code,libelle) values (189, 'RW', 'Rwanda' );
-insert into llx_c_pays (rowid,code,libelle) values (190, 'SH', 'Sainte-H�l�ne' );
-insert into llx_c_pays (rowid,code,libelle) values (191, 'KN', 'Saint-Christophe-et-Ni�v�s');
+insert into llx_c_pays (rowid,code,libelle) values (190, 'SH', 'Sainte-H�l�ne' );
+insert into llx_c_pays (rowid,code,libelle) values (191, 'KN', 'Saint-Christophe-et-Ni�v�s');
insert into llx_c_pays (rowid,code,libelle) values (192, 'LC', 'Sainte-Lucie' );
insert into llx_c_pays (rowid,code,libelle) values (193, 'PM', 'Saint-Pierre-et-Miquelon');
insert into llx_c_pays (rowid,code,libelle) values (194, 'VC', 'Saint-Vincent-et-les-Grenadines');
insert into llx_c_pays (rowid,code,libelle) values (195, 'WS', 'Samoa' );
insert into llx_c_pays (rowid,code,libelle) values (196, 'SM', 'Saint-Marin' );
-insert into llx_c_pays (rowid,code,libelle) values (197, 'ST', 'Sao Tom�-et-Principe');
+insert into llx_c_pays (rowid,code,libelle) values (197, 'ST', 'Sao Tom�-et-Principe');
insert into llx_c_pays (rowid,code,libelle) values (198, 'RS', 'Serbie' );
insert into llx_c_pays (rowid,code,libelle) values (199, 'SC', 'Seychelles' );
insert into llx_c_pays (rowid,code,libelle) values (200, 'SL', 'Sierra Leone' );
insert into llx_c_pays (rowid,code,libelle) values (201, 'SK', 'Slovaquie' );
-insert into llx_c_pays (rowid,code,libelle) values (202, 'SI', 'Slov�nie' );
+insert into llx_c_pays (rowid,code,libelle) values (202, 'SI', 'Slov�nie' );
insert into llx_c_pays (rowid,code,libelle) values (203, 'SB', 'Iles Salomon' );
insert into llx_c_pays (rowid,code,libelle) values (204, 'SO', 'Somalie' );
insert into llx_c_pays (rowid,code,libelle) values (205, 'ZA', 'Afrique du Sud');
-insert into llx_c_pays (rowid,code,libelle) values (206, 'GS', 'Iles G�orgie du Sud et Sandwich du Sud');
+insert into llx_c_pays (rowid,code,libelle) values (206, 'GS', 'Iles G�orgie du Sud et Sandwich du Sud');
insert into llx_c_pays (rowid,code,libelle) values (207, 'LK', 'Sri Lanka' );
insert into llx_c_pays (rowid,code,libelle) values (208, 'SD', 'Soudan' );
insert into llx_c_pays (rowid,code,libelle) values (209, 'SR', 'Suriname' );
insert into llx_c_pays (rowid,code,libelle) values (210, 'SJ', 'Iles Svalbard et Jan Mayen');
insert into llx_c_pays (rowid,code,libelle) values (211, 'SZ', 'Swaziland' );
insert into llx_c_pays (rowid,code,libelle) values (212, 'SY', 'Syrie' );
-insert into llx_c_pays (rowid,code,libelle) values (213, 'TW', 'Ta�wan' );
+insert into llx_c_pays (rowid,code,libelle) values (213, 'TW', 'Ta�wan' );
insert into llx_c_pays (rowid,code,libelle) values (214, 'TJ', 'Tadjikistan' );
insert into llx_c_pays (rowid,code,libelle) values (215, 'TZ', 'Tanzanie' );
-insert into llx_c_pays (rowid,code,libelle) values (216, 'TH', 'Tha�lande' );
+insert into llx_c_pays (rowid,code,libelle) values (216, 'TH', 'Tha�lande' );
insert into llx_c_pays (rowid,code,libelle) values (217, 'TL', 'Timor Oriental');
-insert into llx_c_pays (rowid,code,libelle) values (218, 'TK', 'Tok�laou' );
+insert into llx_c_pays (rowid,code,libelle) values (218, 'TK', 'Tok�laou' );
insert into llx_c_pays (rowid,code,libelle) values (219, 'TO', 'Tonga' );
-insert into llx_c_pays (rowid,code,libelle) values (220, 'TT', 'Trinit�-et-Tobago');
+insert into llx_c_pays (rowid,code,libelle) values (220, 'TT', 'Trinit�-et-Tobago');
insert into llx_c_pays (rowid,code,libelle) values (221, 'TR', 'Turquie' );
-insert into llx_c_pays (rowid,code,libelle) values (222, 'TM', 'Turkm�nistan' );
+insert into llx_c_pays (rowid,code,libelle) values (222, 'TM', 'Turkm�nistan' );
insert into llx_c_pays (rowid,code,libelle) values (223, 'TC', 'Iles Turks-et-Caicos');
insert into llx_c_pays (rowid,code,libelle) values (224, 'TV', 'Tuvalu' );
insert into llx_c_pays (rowid,code,libelle) values (225, 'UG', 'Ouganda' );
insert into llx_c_pays (rowid,code,libelle) values (226, 'UA', 'Ukraine' );
-insert into llx_c_pays (rowid,code,libelle) values (227, 'AE', '�mirats arabes unis');
-insert into llx_c_pays (rowid,code,libelle) values (228, 'UM', 'Iles mineures �loign�es des �tats-Unis');
+insert into llx_c_pays (rowid,code,libelle) values (227, 'AE', '�mirats arabes unis');
+insert into llx_c_pays (rowid,code,libelle) values (228, 'UM', 'Iles mineures �loign�es des �tats-Unis');
insert into llx_c_pays (rowid,code,libelle) values (229, 'UY', 'Uruguay' );
-insert into llx_c_pays (rowid,code,libelle) values (230, 'UZ', 'Ouzb�kistan' );
+insert into llx_c_pays (rowid,code,libelle) values (230, 'UZ', 'Ouzb�kistan' );
insert into llx_c_pays (rowid,code,libelle) values (231, 'VU', 'Vanuatu' );
-insert into llx_c_pays (rowid,code,libelle) values (232, 'VE', 'V�n�zuela' );
-insert into llx_c_pays (rowid,code,libelle) values (233, 'VN', 'Vi�t Nam' );
+insert into llx_c_pays (rowid,code,libelle) values (232, 'VE', 'V�n�zuela' );
+insert into llx_c_pays (rowid,code,libelle) values (233, 'VN', 'Vi�t Nam' );
insert into llx_c_pays (rowid,code,libelle) values (234, 'VG', 'Iles Vierges britanniques');
-insert into llx_c_pays (rowid,code,libelle) values (235, 'VI', 'Iles Vierges am�ricaines');
+insert into llx_c_pays (rowid,code,libelle) values (235, 'VI', 'Iles Vierges am�ricaines');
insert into llx_c_pays (rowid,code,libelle) values (236, 'WF', 'Wallis-et-Futuna');
insert into llx_c_pays (rowid,code,libelle) values (237, 'EH', 'Sahara occidental');
-insert into llx_c_pays (rowid,code,libelle) values (238, 'YE', 'Y�men' );
+insert into llx_c_pays (rowid,code,libelle) values (238, 'YE', 'Y�men' );
insert into llx_c_pays (rowid,code,libelle) values (239, 'ZM', 'Zambie' );
insert into llx_c_pays (rowid,code,libelle) values (240, 'ZW', 'Zimbabwe' );
@@ -657,7 +656,7 @@ ALTER TABLE llx_facture ADD CONSTRAINT fk_facture_source_fk_facture FOREIGN KEY
alter table llx_facture add column type smallint DEFAULT 0 NOT NULL after facnumber;
--- Supprimme orphelins pour permettre mont�e de la cl�
+-- Supprimme orphelins pour permettre mont�e de la cl�
-- V4 DELETE llx_commandedet FROM llx_commandedet LEFT JOIN llx_commande ON llx_commandedet.fk_commande = llx_commande.rowid WHERE llx_commande.rowid IS NULL;
ALTER TABLE llx_commandedet ADD INDEX idx_commandedet_fk_commande (fk_commande);
@@ -684,7 +683,7 @@ alter table llx_societe_remise_except ADD COLUMN fk_facture_source integer after
update llx_societe_remise_except set amount_tva=0, tva_tx=0, amount_ttc = amount_ht where amount_ttc = 0;
delete from llx_societe_remise_except WHERE amount_ht=0;
--- Supprimme orphelins pour permettre mont�e de la cl�
+-- Supprimme orphelins pour permettre mont�e de la cl�
-- V4 DELETE llx_societe_remise_except FROM llx_societe_remise_except LEFT JOIN llx_facturedet ON llx_societe_remise_except.fk_facture = llx_facturedet.rowid WHERE llx_facturedet.rowid IS NULL;
ALTER TABLE llx_societe_remise_except DROP FOREIGN KEY fk_societe_remise_fk_facture;
@@ -702,7 +701,7 @@ ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_factur
update llx_societe_remise_except set description='Remise sans description' where description is NULL or description ='';
alter table llx_societe_remise_except modify description varchar(255) NOT NULL;
-insert into llx_const (name, value, type, visible, note) VALUES ('PROPALE_VALIDITY_DURATION', '15', 'chaine', 0, 'Dur�e de validit�e des propales');
+insert into llx_const (name, value, type, visible, note) VALUES ('PROPALE_VALIDITY_DURATION', '15', 'chaine', 0, 'Dur�e de validit�e des propales');
alter table llx_propal add column ref_client varchar(30) after ref;
@@ -756,7 +755,7 @@ alter table llx_propal drop column fk_soc_contact;
alter table llx_commandedet drop column label;
-insert into llx_action_def (rowid,code,titre,description,objet_type) values (3,'NOTIFY_VAL_ORDER_SUUPLIER','Validation commande fournisseur','D�clench� lors de la validation d\'une commande fournisseur','order_supplier');
+insert into llx_action_def (rowid,code,titre,description,objet_type) values (3,'NOTIFY_VAL_ORDER_SUUPLIER','Validation commande fournisseur','D�clench� lors de la validation d\'une commande fournisseur','order_supplier');
@@ -808,7 +807,7 @@ update llx_facture set fk_statut=2 where close_code is not null and close_code !
update llx_boxes set fk_user = 0 where fk_user IS NULL;
ALTER TABLE llx_boxes modify fk_user integer default 0 NOT NULL;
--- Supprimme orphelins pour permettre mont�e de la cl�
+-- Supprimme orphelins pour permettre mont�e de la cl�
-- V4 DELETE llx_boxes FROM llx_boxes LEFT JOIN llx_boxes_def ON llx_boxes.box_id = llx_boxes_def.rowid WHERE llx_boxes_def.rowid IS NULL;
ALTER TABLE llx_boxes ADD INDEX idx_boxes_boxid (box_id);
@@ -850,7 +849,7 @@ create table llx_commande_fournisseur_dispatch
rowid integer AUTO_INCREMENT PRIMARY KEY,
fk_commande integer,
fk_product integer,
- qty float, -- quantit�
+ qty float, -- quantit�
fk_entrepot integer,
fk_user integer,
datec datetime
@@ -861,10 +860,10 @@ ALTER TABLE llx_commande_fournisseur_dispatch ADD INDEX (fk_commande);
create table llx_stock_valorisation
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
- tms timestamp, -- date technique mise � jour automatiquement
+ tms timestamp, -- date technique mise � jour automatiquement
date_valo datetime, -- date de valorisation
fk_product integer NOT NULL, -- id du produit concerne par l'operation
- qty_ope float(9,3), -- quantit� de l'operation
+ qty_ope float(9,3), -- quantit� de l'operation
price_ope float(12,4), -- prix unitaire du produit concerne par l'operation
valo_ope float(12,4), -- valorisation de l'operation
price_pmp float(12,4), -- valeur PMP de l'operation
@@ -879,7 +878,7 @@ create table llx_stock_valorisation
create table llx_entrepot_valorisation
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
- tms timestamp, -- date technique mise � jour automatiquement
+ tms timestamp, -- date technique mise � jour automatiquement
date_calcul date, -- date auquel a ete calcule la valeur
fk_entrepot integer UNSIGNED NOT NULL ,
valo_pmp float(12,4), -- valoristaion du stock en PMP
diff --git a/mysql/migration/2.1.0-2.2.0.sql b/mysql/migration/2.1.0-2.2.0.sql
index 6305c4fdab8cf7a7cdc13b10a8c82421b23384bf..4851d46c8b273baa19145dc0407f003a5bbcd09f 100644
--- a/mysql/migration/2.1.0-2.2.0.sql
+++ b/mysql/migration/2.1.0-2.2.0.sql
@@ -1,10 +1,8 @@
--
-- $Id$
--- $Source$
--- $Revision$
--
--- Attention � l ordre des requetes.
--- Ce fichier doit �tre charg� sur une version 2.1.0
+-- Attention a l ordre des requetes.
+-- Ce fichier doit etre charge sur une version 2.1.0
-- sans AUCUNE erreur ni warning
--
@@ -30,7 +28,7 @@ alter table llx_categorie add column type tinyint DEFAULT 1 NOT NULL;
-- V4.1 delete c from llx_categorie as c where c.rowid in (select distinct c2.rowid from tmp_categorie1 as c2, tmp_categorie2 as cc2 where c2.rowid != cc2.rowid and c2.type = cc2.type and c2.label = cc2.label) and c.rowid not in (select min(c3.rowid) from tmp_categorie1 as c3, tmp_categorie2 as cc3 where c3.rowid != cc3.rowid and c3.type = cc3.type and c3.label = cc3.label group by c3.label,c3.type);
-- V4.1 DROP TABLE tmp_categorie1;
-- V4.1 DROP TABLE tmp_categorie2;
--- Si suppression des doublons precedente a ete faite, on monte la cl� sur les categories
+-- Si suppression des doublons precedente a ete faite, on monte la cl� sur les categories
-- V4.1 ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label,type);
-- On migre les categories fournisseur de la table llx_fournisseur_categorie qui est obsolete vers table llx_categories qui est generique pour gerer les categories de tout type
@@ -45,7 +43,7 @@ alter table llx_categorie add column type tinyint DEFAULT 1 NOT NULL;
-- V4.1 delete c from llx_categorie as c where c.rowid in (select distinct c2.rowid from tmp_categorie1 as c2, tmp_categorie2 as cc2 where c2.rowid != cc2.rowid and c2.type = cc2.type and c2.label = cc2.label) and c.rowid not in (select min(c3.rowid) from tmp_categorie1 as c3, tmp_categorie2 as cc3 where c3.rowid != cc3.rowid and c3.type = cc3.type and c3.label = cc3.label group by c3.label,c3.type);
-- V4.1 DROP TABLE tmp_categorie1;
-- V4.1 DROP TABLE tmp_categorie2;
--- Si suppression des doublons precedente a ete faite, on monte la cl� sur les categories
+-- Si suppression des doublons precedente a ete faite, on monte la cl� sur les categories
-- V4.1 ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label,type);
@@ -94,7 +92,7 @@ alter table llx_chargesociales modify fk_type integer NOT NULL;
alter table llx_chargesociales modify libelle varchar(80) NOT NULL;
insert into llx_rights_def (id, libelle, module, type, bydefault, subperms, perms) values (114,'Rapprocher transactions','banque','w',0,null,'consolidate');
-update llx_rights_def set libelle='Cr�er/modifier/supprimer �criture bancaire' where perms='modifier' AND module='banque';
+update llx_rights_def set libelle='Cr�er/modifier/supprimer �criture bancaire' where perms='modifier' AND module='banque';
-- Supprime colone en doublon avec fk_user_creat
alter table llx_paiement drop column author;
@@ -142,7 +140,7 @@ alter table llx_tva add fk_user_modif integer;
-- V4.1 UPDATE llx_tva as t set fk_user_creat = (SELECT MIN(fk_user_author) FROM llx_bank as b WHERE b.datev = t.datev AND b.amount = -t.amount AND b.label like 'R%glement TVA') WHERE t.fk_user_creat IS NULL;
--- Extention de la gestion des cat�gories
+-- Extention de la gestion des cat�gories
alter table llx_categorie ADD type int not null default '0';
-- V4 ALTER TABLE llx_categorie DROP INDEX uk_categorie_ref;
@@ -170,7 +168,7 @@ alter table `llx_categorie_product`
add constraint `fk_categorie_product_product_rowid` foreign key(`fk_product`) REFERENCES `llx_product` (`rowid`);
--- Ajout gestion du droit de pr�t
+-- Ajout gestion du droit de pr�t
drop table if exists `llx_droitpret_rapport`;
create table `llx_droitpret_rapport` (
`rowid` int(11) NOT NULL auto_increment,
@@ -388,7 +386,7 @@ insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titr
insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2303, 'accountancy', '$leftmenu=="vat"', 2300, '/compta/tva/clients.php', 'ReportByCustomers', 1, 'companies', '$user->rights->tax->charges->lire', '', 0, 2);
insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2400, 'accountancy', '', 6, '/compta/ventilation/index.php?leftmenu=ventil', 'Ventilation', 0, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 8);
insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2401, 'accountancy', '$leftmenu=="ventil"', 2400, '/compta/ventilation/liste.php', 'A ventiler', 1, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2402, 'accountancy', '$leftmenu=="ventil"', 2400, '/compta/ventilation/lignes.php', 'Ventil�es', 1, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 1);
+insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2402, 'accountancy', '$leftmenu=="ventil"', 2400, '/compta/ventilation/lignes.php', 'Ventil�es', 1, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 1);
insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2403, 'accountancy', '$leftmenu=="ventil"', 2400, '/compta/param/', 'Setup', 1, 'companies', '$user->rights->compta->ventilation->parametrer', '', 0, 2);
insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2404, 'accountancy', '$leftmenu=="ventil"', 2403, '/compta/param/comptes/liste.php', 'List', 2, 'companies', '$user->rights->compta->ventilation->parametrer', '', 0, 0);
insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2405, 'accountancy', '$leftmenu=="ventil"', 2403, '/compta/param/comptes/fiche.php?action=create', 'New', 2, 'companies', '$user->rights->compta->ventilation->parametrer', '', 0, 1);
@@ -413,7 +411,7 @@ insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titr
insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2606, 'accountancy', '$leftmenu=="bank"', 2600, '/compta/bank/virement.php', 'BankTransfers', 1, 'banks', '$user->rights->banque->modifier', '', 0, 5);
insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2607, 'accountancy', '$leftmenu=="bank"', 2600, '/compta/bank/bplc.php', 'Transactions BPLC', 1, 'banks', '', '', 0, 6);
insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2700, 'accountancy', '', 6, '/compta/resultat/index.php?leftmenu=ca&mainmenu=accountancy', 'Reportings', 0, 'main', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->comptarapport->lire', '', 0, 11);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2701, 'accountancy', '$leftmenu=="ca"', 2700, '/compta/resultat/index.php?leftmenu=ca', 'R�sultat / Exercice', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->comptarapport->lire', '', 0, 0);
+insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2701, 'accountancy', '$leftmenu=="ca"', 2700, '/compta/resultat/index.php?leftmenu=ca', 'R�sultat / Exercice', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->comptarapport->lire', '', 0, 0);
insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2702, 'accountancy', '$leftmenu=="ca"', 2701, '/compta/resultat/clientfourn.php?leftmenu=ca', 'ByCompanies', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->comptarapport->lire', '', 0, 0);
insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2703, 'accountancy', '$leftmenu=="ca"', 2700, '/compta/stats/index.php?leftmenu=ca', 'Chiffre d''affaire', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->comptarapport->lire', '', 0, 1);
insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2704, 'accountancy', '$leftmenu=="ca"', 2703, '/compta/stats/casoc?leftmenu=ca', 'ByCompanies', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->comptarapport->lire', '', 0, 0);
@@ -480,13 +478,13 @@ insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titr
insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4501, 'members', '$leftmenu=="export"', 4500, '/exports/index.php?leftmenu=export', 'Datas', 1, 'members', '$user->rights->adherent->export', '', 2, 0);
insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4502, 'members', '$leftmenu=="export"', 4500, '/adherents/htpasswd.php?leftmenu=export', 'Filehtpasswd', 1, 'members', '$user->rights->adherent->export', '', 2, 1);
insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4503, 'members', '$leftmenu=="export"', 4500, '/adherents/cartes/carte.php?leftmenu=export', 'MembersCards', 1, 'members', '$user->rights->adherent->export', '_blank', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4504, 'members', '$leftmenu=="export"', 4500, '/adherents/cartes/etiquette.php?leftmenu=export', 'Etiquettes d''adh�rents', 1, 'members', '$user->rights->adherent->export', '_blank', 2, 3);
+insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4504, 'members', '$leftmenu=="export"', 4500, '/adherents/cartes/etiquette.php?leftmenu=export', 'Etiquettes d''adh�rents', 1, 'members', '$user->rights->adherent->export', '_blank', 2, 3);
insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4600, 'members', '', 15, '/public/adherents/index.php?leftmenu=member_public', 'MemberPublicLinks', 0, 'members', '$user->rights->adherent->export', '', 2, 4);
insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4700, 'members', '', 15, '/adherents/index.php?leftmenu=setup&mainmenu=members', 'Setup', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5);
insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4701, 'members', '', 4700, '/adherents/type.php?leftmenu=setup', 'MembersTypes', 1, 'members', '$user->rights->adherent->configurer', '', 2, 0);
insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4702, 'members', '', 4700, '/adherents/options.php?leftmenu=setup', 'MembersAttributes', 1, 'members', '$user->rights->adherent->configurer', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4800, 'product', '', 3, '/product/droitpret/index.php?leftmenu=droitpret', 'Droit de pr�t', 0, 'products', '$user->rights->droitpret->lire', '', 2, 5);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4801, 'product', '$leftmenu=="droitpret"', 4800, '/product/droitpret/index.php?leftmenu=droitpret', 'G�n�rer rapport', 1, 'products', '$user->rights->droitpret->creer', '', 2, 1);
+insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4800, 'product', '', 3, '/product/droitpret/index.php?leftmenu=droitpret', 'Droit de pr�t', 0, 'products', '$user->rights->droitpret->lire', '', 2, 5);
+insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4801, 'product', '$leftmenu=="droitpret"', 4800, '/product/droitpret/index.php?leftmenu=droitpret', 'G�n�rer rapport', 1, 'products', '$user->rights->droitpret->creer', '', 2, 1);
insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4900, 'suppliers', '', 4, '/categories/index.php?leftmenu=cat&type=1', 'Categories', 0, 'categories', '$user->rights->categorie>lire', '', 2, 3);
insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4901, 'suppliers', '$leftmenu=="cat"', 4900, '/categories/fiche.php?action=create&type=1', 'NewCat', 1, 'categories', '$user->rights->categorie>creer', '', 2, 0);
insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (5000, 'commercial', '', 5, '/categories/index.php?leftmenu=cat&type=2', 'Categories', 0, 'commercial', '$user->rights->categorie>lire', '', 2, 9);
@@ -764,7 +762,7 @@ ALTER TABLE llx_societe_remise_except MODIFY amount_ttc double(24,8) DEFAULT
ALTER TABLE llx_societe_remise_except MODIFY tva_tx double(6,3) DEFAULT 0;
--- Supprimme orphelins pour permettre mont�e de la cl�
+-- Supprimme orphelins pour permettre mont�e de la cl�
-- V4 DELETE llx_commande_fournisseur FROM llx_commande_fournisseur LEFT JOIN llx_societe ON llx_commande_fournisseur.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL;
@@ -882,44 +880,44 @@ create table llx_c_ecotaxe
active tinyint DEFAULT 1 NOT NULL
)type=innodb;
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (1, 'ER-A-A', 'Mat�riels �lectriques < 0,2kg', 0.01000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (2, 'ER-A-B', 'Mat�riels �lectriques >= 0,2 kg et < 0,5 kg', 0.03000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (3, 'ER-A-C', 'Mat�riels �lectriques >= 0,5 kg et < 1 kg', 0.04000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (4, 'ER-A-D', 'Mat�riels �lectriques >= 1 kg et < 2 kg', 0.13000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (5, 'ER-A-E', 'Mat�riels �lectriques >= 2 kg et < 4kg', 0.21000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (6, 'ER-A-F', 'Mat�riels �lectriques >= 4 kg et < 8 kg', 0.42000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (7, 'ER-A-G', 'Mat�riels �lectriques >= 8 kg et < 15 kg', 0.84000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (8, 'ER-A-H', 'Mat�riels �lectriques >= 15 kg et < 20 kg', 1.25000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (9, 'ER-A-I', 'Mat�riels �lectriques >= 20 kg et < 30 kg', 1.88000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (10, 'ER-A-J', 'Mat�riels �lectriques >= 30 kg', 3.34000000, 'ERP', 1, 1);
+INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (1, 'ER-A-A', 'Mat�riels �lectriques < 0,2kg', 0.01000000, 'ERP', 1, 1);
+INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (2, 'ER-A-B', 'Mat�riels �lectriques >= 0,2 kg et < 0,5 kg', 0.03000000, 'ERP', 1, 1);
+INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (3, 'ER-A-C', 'Mat�riels �lectriques >= 0,5 kg et < 1 kg', 0.04000000, 'ERP', 1, 1);
+INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (4, 'ER-A-D', 'Mat�riels �lectriques >= 1 kg et < 2 kg', 0.13000000, 'ERP', 1, 1);
+INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (5, 'ER-A-E', 'Mat�riels �lectriques >= 2 kg et < 4kg', 0.21000000, 'ERP', 1, 1);
+INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (6, 'ER-A-F', 'Mat�riels �lectriques >= 4 kg et < 8 kg', 0.42000000, 'ERP', 1, 1);
+INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (7, 'ER-A-G', 'Mat�riels �lectriques >= 8 kg et < 15 kg', 0.84000000, 'ERP', 1, 1);
+INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (8, 'ER-A-H', 'Mat�riels �lectriques >= 15 kg et < 20 kg', 1.25000000, 'ERP', 1, 1);
+INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (9, 'ER-A-I', 'Mat�riels �lectriques >= 20 kg et < 30 kg', 1.88000000, 'ERP', 1, 1);
+INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (10, 'ER-A-J', 'Mat�riels �lectriques >= 30 kg', 3.34000000, 'ERP', 1, 1);
INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (11, 'ER-M-1', 'TV, Moniteurs < 9kg', 0.84000000, 'ERP', 1, 1);
INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (12, 'ER-M-2', 'TV, Moniteurs >= 9kg et < 15kg', 1.67000000, 'ERP', 1, 1);
INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (13, 'ER-M-3', 'TV, Moniteurs >= 15kg et < 30kg', 3.34000000, 'ERP', 1, 1);
INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (14, 'ER-M-4', 'TV, Moniteurs >= 30 kg', 6.69000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (15, 'EC-A-A', 'Mat�riels �lectriques 0,2 kg max', 0.00840000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (16, 'EC-A-B', 'Mat�riels �lectriques 0,21 kg min - 0,50 kg max', 0.02500000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (17, 'EC-A-C', 'Mat�riels �lectriques 0,51 kg min - 1 kg max', 0.04000000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (18, 'EC-A-D', 'Mat�riels �lectriques 1,01 kg min - 2,5 kg max', 0.13000000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (19, 'EC-A-E', 'Mat�riels �lectriques 2,51 kg min - 4 kg max', 0.21000000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (20, 'EC-A-F', 'Mat�riels �lectriques 4,01 kg min - 8 kg max', 0.42000000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (21, 'EC-A-G', 'Mat�riels �lectriques 8,01 kg min - 12 kg max', 0.63000000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (22, 'EC-A-H', 'Mat�riels �lectriques 12,01 kg min - 20 kg max', 1.05000000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (23, 'EC-A-I', 'Mat�riels �lectriques 20,01 kg min', 1.88000000, 'Ecologic', 1, 1);
+INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (15, 'EC-A-A', 'Mat�riels �lectriques 0,2 kg max', 0.00840000, 'Ecologic', 1, 1);
+INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (16, 'EC-A-B', 'Mat�riels �lectriques 0,21 kg min - 0,50 kg max', 0.02500000, 'Ecologic', 1, 1);
+INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (17, 'EC-A-C', 'Mat�riels �lectriques 0,51 kg min - 1 kg max', 0.04000000, 'Ecologic', 1, 1);
+INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (18, 'EC-A-D', 'Mat�riels �lectriques 1,01 kg min - 2,5 kg max', 0.13000000, 'Ecologic', 1, 1);
+INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (19, 'EC-A-E', 'Mat�riels �lectriques 2,51 kg min - 4 kg max', 0.21000000, 'Ecologic', 1, 1);
+INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (20, 'EC-A-F', 'Mat�riels �lectriques 4,01 kg min - 8 kg max', 0.42000000, 'Ecologic', 1, 1);
+INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (21, 'EC-A-G', 'Mat�riels �lectriques 8,01 kg min - 12 kg max', 0.63000000, 'Ecologic', 1, 1);
+INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (22, 'EC-A-H', 'Mat�riels �lectriques 12,01 kg min - 20 kg max', 1.05000000, 'Ecologic', 1, 1);
+INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (23, 'EC-A-I', 'Mat�riels �lectriques 20,01 kg min', 1.88000000, 'Ecologic', 1, 1);
INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (24, 'EC-M-1', 'TV, Moniteurs 9 kg max', 0.84000000, 'Ecologic', 1, 1);
INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (25, 'EC-M-2', 'TV, Moniteurs 9,01 kg min - 18 kg max', 1.67000000, 'Ecologic', 1, 1);
INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (26, 'EC-M-3', 'TV, Moniteurs 18,01 kg min - 36 kg max', 3.34000000, 'Ecologic', 1, 1);
INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (27, 'EC-M-4', 'TV, Moniteurs 36,01 kg min', 6.69000000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (28, 'ES-M-1', 'TV, Moniteurs <= 20 pouces', 0.84000000, 'Eco-syst�mes', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (29, 'ES-M-2', 'TV, Moniteurs > 20 pouces et <= 32 pouces', 3.34000000, 'Eco-syst�mes', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (30, 'ES-M-3', 'TV, Moniteurs > 32 pouces et autres grands �crans', 6.69000000, 'Eco-syst�mes', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (31, 'ES-A-A', 'Ordinateur fixe, Audio home systems (HIFI), �l�ments hifi s�par�s...', 0.84000000, 'Eco-syst�mes', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (32, 'ES-A-B', 'Ordinateur portable, CD-RCR, VCR, lecteurs et enregistreurs DVD... Instruments de musique et caisses de r�sonance, haut parleurs...', 0.25000000, 'Eco-syst�mes', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (33, 'ES-A-C', 'Imprimante, photocopieur, t�l�copieur,...', 0.42000000, 'Eco-syst�mes', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (34, 'ES-A-D', 'Accessoires, clavier, souris, PDA, imprimante photo, appareil photo, gps, t�l�phone, r�pondeur, t�l�phone sans fil, modem,... T�l�commande, casque, cam�scope, baladeur mp3, radio portable, radio K7 et CD portable, set top box, radio r�veil,...', 0.08400000, 'Eco-syst�mes', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (35, 'ES-A-E', 'GSM', 0.00840000, 'Eco-syst�mes', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (36, 'ES-A-F', 'Jouets et �quipements de loisirs et de sports < 0,5 kg', 0.04200000, 'Eco-syst�mes', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (37, 'ES-A-G', 'Jouets et �quipements de loisirs et de sports > 0,5 kg', 0.17000000, 'Eco-syst�mes', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (38, 'ES-A-H', 'Jouets et �quipements de loisirs et de sports > 10 kg', 1.25000000, 'Eco-syst�mes', 1, 1);
+INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (28, 'ES-M-1', 'TV, Moniteurs <= 20 pouces', 0.84000000, 'Eco-syst�mes', 1, 1);
+INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (29, 'ES-M-2', 'TV, Moniteurs > 20 pouces et <= 32 pouces', 3.34000000, 'Eco-syst�mes', 1, 1);
+INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (30, 'ES-M-3', 'TV, Moniteurs > 32 pouces et autres grands �crans', 6.69000000, 'Eco-syst�mes', 1, 1);
+INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (31, 'ES-A-A', 'Ordinateur fixe, Audio home systems (HIFI), �l�ments hifi s�par�s...', 0.84000000, 'Eco-syst�mes', 1, 1);
+INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (32, 'ES-A-B', 'Ordinateur portable, CD-RCR, VCR, lecteurs et enregistreurs DVD... Instruments de musique et caisses de r�sonance, haut parleurs...', 0.25000000, 'Eco-syst�mes', 1, 1);
+INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (33, 'ES-A-C', 'Imprimante, photocopieur, t�l�copieur,...', 0.42000000, 'Eco-syst�mes', 1, 1);
+INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (34, 'ES-A-D', 'Accessoires, clavier, souris, PDA, imprimante photo, appareil photo, gps, t�l�phone, r�pondeur, t�l�phone sans fil, modem,... T�l�commande, casque, cam�scope, baladeur mp3, radio portable, radio K7 et CD portable, set top box, radio r�veil,...', 0.08400000, 'Eco-syst�mes', 1, 1);
+INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (35, 'ES-A-E', 'GSM', 0.00840000, 'Eco-syst�mes', 1, 1);
+INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (36, 'ES-A-F', 'Jouets et �quipements de loisirs et de sports < 0,5 kg', 0.04200000, 'Eco-syst�mes', 1, 1);
+INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (37, 'ES-A-G', 'Jouets et �quipements de loisirs et de sports > 0,5 kg', 0.17000000, 'Eco-syst�mes', 1, 1);
+INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (38, 'ES-A-H', 'Jouets et �quipements de loisirs et de sports > 10 kg', 1.25000000, 'Eco-syst�mes', 1, 1);
ALTER TABLE llx_commandedet CHANGE coef marge_tx double(6,3) DEFAULT 0;
ALTER TABLE llx_commandedet ADD COLUMN marge_tx double(6,3) DEFAULT 0;
@@ -996,7 +994,7 @@ ALTER TABLE llx_product ADD COLUMN partnumber varchar(32) after gencode;
ALTER TABLE llx_element_contact ADD INDEX idx_element_contact_fk_socpeople (fk_socpeople);
--- Supprimme orphelins pour permettre mont�e de la cl�
+-- Supprimme orphelins pour permettre mont�e de la cl�
-- V4 DELETE llx_fichinter FROM llx_fichinter LEFT JOIN llx_societe ON llx_fichinter.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL;
@@ -1067,31 +1065,31 @@ create table llx_societe_log
)type=innodb;
--- Pour la Tunisie (Formes les plus utilis�es)
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1000','Soci�t� � responsabilit� limit�e SARL');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1001','Soci�t� en Nom Collectif');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1002','Soci�t� en Commandite Simple');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1003','soci�t� en participation');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1004','Soci�t� Anonyme SA');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1005','Soci�t� Unipersonnelle � Responsabilit� Limit�e SUARL');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1006','Groupement d\'int�r�t �conomique GEI');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1007','Groupe de soci�t�s');
+-- Pour la Tunisie (Formes les plus utilis�es)
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1000','Soci�t� � responsabilit� limit�e SARL');
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1001','Soci�t� en Nom Collectif');
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1002','Soci�t� en Commandite Simple');
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1003','soci�t� en participation');
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1004','Soci�t� Anonyme SA');
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1005','Soci�t� Unipersonnelle � Responsabilit� Limit�e SUARL');
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1006','Groupement d\'int�r�t �conomique GEI');
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1007','Groupe de soci�t�s');
-- Regions de Tunisie (id pays=10)
insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1001,10,1001, '',0,'Ariana');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1002,10,1002, '',0,'B�ja');
+insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1002,10,1002, '',0,'B�ja');
insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1003,10,1003, '',0,'Ben Arous');
insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1004,10,1004, '',0,'Bizerte');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1005,10,1005, '',0,'Gab�s');
+insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1005,10,1005, '',0,'Gab�s');
insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1006,10,1006, '',0,'Gafsa');
insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1007,10,1007, '',0,'Jendouba');
insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1008,10,1008, '',0,'Kairouan');
insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1009,10,1009, '',0,'Kasserine');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1010,10,1010, '',0,'K�bili');
+insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1010,10,1010, '',0,'K�bili');
insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1011,10,1011, '',0,'La Manouba');
insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1012,10,1012, '',0,'Le Kef');
insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1013,10,1013, '',0,'Mahdia');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1014,10,1014, '',0,'M�denine');
+insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1014,10,1014, '',0,'M�denine');
insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1015,10,1015, '',0,'Monastir');
insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1016,10,1016, '',0,'Nabeul');
insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1017,10,1017, '',0,'Sfax');
@@ -1107,23 +1105,23 @@ insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (101,10, '6','0','TVA 6%',1);
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (102,10, '12','0','TVA 12%',1);
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (103,10, '18','0','VAT 18%',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (104,10, '7.5','0','TVA 6% Major� � 25% (7.5%)',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (105,10, '15','0','TVA 12% Major� � 25% (15%)',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (106,10, '22.5','0','VAT 18% Major� � 25% (22.5%)',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (104,10, '7.5','0','TVA 6% Major� � 25% (7.5%)',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (105,10, '15','0','TVA 12% Major� � 25% (15%)',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (106,10, '22.5','0','VAT 18% Major� � 25% (22.5%)',1);
-- GUADELOUPE (id 105)
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 111, 105, '8.5','0','VAT Rate 8.5',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 112, 105, '8.5','1','VAT Rate 8.5 non per�u par le vendeur mais r�cup�rable par l\'acheteur',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 112, 105, '8.5','1','VAT Rate 8.5 non per�u par le vendeur mais r�cup�rable par l\'acheteur',1);
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 113, 105, '0','0','VAT Rate 0 ou non applicable',1);
-- MARTINIQUE (id 150)
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 121, 150, '8.5','0','VAT Rate 8.5',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 122, 150, '8.5','1','VAT Rate 8.5 non per�u par le vendeur mais r�cup�rable par l\'acheteur',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 122, 150, '8.5','1','VAT Rate 8.5 non per�u par le vendeur mais r�cup�rable par l\'acheteur',1);
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 123, 150, '0','0','VAT Rate 0 ou non applicable',1);
-- REUNION (id 187)
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 131, 187, '8.5','0','VAT Rate 8.5',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 132, 187, '8.5','1','VAT Rate 8.5 non per�u par le vendeur mais r�cup�rable par l\'acheteur',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 132, 187, '8.5','1','VAT Rate 8.5 non per�u par le vendeur mais r�cup�rable par l\'acheteur',1);
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 133, 187, '0','0','VAT Rate 0 ou non applicable',1);
ALTER TABLE llx_bank_account MODIFY iban_prefix varchar(50);
@@ -1131,15 +1129,15 @@ ALTER TABLE llx_bank_account ADD COLUMN country_iban varchar(2) after iban_prefi
ALTER TABLE llx_bank_account ADD COLUMN cle_iban varchar(2) after country_iban;
--- Mise � jour des pays
+-- Mise � jour des pays
update llx_c_pays set libelle = 'Palaos' where rowid = 176 and code = 'PW' and libelle = 'Belau';
update llx_c_pays set libelle = 'Serbie' where rowid = 198 and code = 'CS';
update llx_c_pays set code = 'RS' where rowid = 198 and code = 'CS';
insert into llx_c_pays (rowid,code,libelle) values (241, 'GG', 'Guernesey' );
insert into llx_c_pays (rowid,code,libelle) values (242, 'IM', 'Ile de Man' );
insert into llx_c_pays (rowid,code,libelle) values (243, 'JE', 'Jersey' );
-insert into llx_c_pays (rowid,code,libelle) values (244, 'ME', 'Mont�n�gro' );
-insert into llx_c_pays (rowid,code,libelle) values (245, 'BL', 'Saint-Barth�lemy');
+insert into llx_c_pays (rowid,code,libelle) values (244, 'ME', 'Mont�n�gro' );
+insert into llx_c_pays (rowid,code,libelle) values (245, 'BL', 'Saint-Barth�lemy');
insert into llx_c_pays (rowid,code,libelle) values (246, 'MF', 'Saint-Martin' );
diff --git a/pgsql/functions/functions.sql b/pgsql/functions/functions.sql
index c32702a5e58fd83b68a7d5d6ad18a0a008a9dd79..780c306c565d79595fe84c1903d33e16735044bb 100644
--- a/pgsql/functions/functions.sql
+++ b/pgsql/functions/functions.sql
@@ -16,7 +16,6 @@
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
--
-- $Id$
--- $Source$
--
-- ============================================================================