From 12829edac3118c050c1098dd3db9ff2f7715406c Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Tue, 18 Jul 2006 07:54:58 +0000
Subject: [PATCH] =?UTF-8?q?Ajout=20de=20balise=20(ancre=20en=20fait)=20sur?=
=?UTF-8?q?=20le=20up/down=20des=20lignes=20et=20sur=20la=20g=E9n=E9ration?=
=?UTF-8?q?=20du=20pdf.=20D=E9but=20ajout=20de=20tous=20les=20pays.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
htdocs/comm/propal.php | 31 +++++++++-
htdocs/commande/fiche.php | 30 ++++++++--
htdocs/compta/facture.php | 54 +++++++++++++----
htdocs/html.form.class.php | 2 +-
mysql/data/data.sql | 100 +++++++++++++++++++++++++++++---
mysql/migration/2.0.0-2.1.0.sql | 2 +
mysql/tables/llx_c_pays.sql | 2 +-
7 files changed, 195 insertions(+), 26 deletions(-)
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 913e1a9a0a9..aaedd3d0bb9 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -550,7 +550,16 @@ if ($_REQUEST['action'] == 'builddoc' && $user->rights->propale->creer)
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
}
- propale_pdf_create($db, $propal->id, $propal->modelpdf, $outputlangs);
+ $result=propale_pdf_create($db, $propal->id, $propal->modelpdf, $outputlangs);
+ if ($result <= 0)
+ {
+ dolibarr_print_error($db,$result);
+ exit;
+ }
+ else
+ {
+ Header ('Location: '.$_SERVER["PHP_SELF"].'?propalid='.$propal->id.'#builddoc');
+ }
}
@@ -625,13 +634,29 @@ if ($_POST["action"] == 'setmode')
if ($_GET['action'] == 'up' && $user->rights->propale->creer)
{
$propal = new Propal($db, '', $_GET["propalid"]);
+ $propal->fetch($_GET['propalid']);
$propal->line_up($_GET['rowid']);
+ if ($_REQUEST['lang_id'])
+ {
+ $outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
+ $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+ }
+ propale_pdf_create($db, $propal->id, $propal->modelpdf, $outputlangs);
+ Header ('Location: '.$_SERVER["PHP_SELF"].'?propalid='.$_GET["propalid"].'#'.$_GET['rowid']);
}
if ($_GET['action'] == 'down' && $user->rights->propale->creer)
{
$propal = new Propal($db, '', $_GET["propalid"]);
+ $propal->fetch($_GET['propalid']);
$propal->line_down($_GET['rowid']);
+ if ($_REQUEST['lang_id'])
+ {
+ $outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
+ $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+ }
+ propale_pdf_create($db, $propal->id, $propal->modelpdf, $outputlangs);
+ Header ('Location: '.$_SERVER["PHP_SELF"].'?propalid='.$_GET["propalid"].'#'.$_GET['rowid']);
}
@@ -1031,6 +1056,7 @@ if ($_GET['propalid'] > 0)
else
{
print '<td>';
+ print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
if (($objp->info_bits & 2) == 2)
{
print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$propal->socidp.'">';
@@ -1123,9 +1149,9 @@ if ($_GET['propalid'] > 0)
print '<input type="hidden" name="ligne" value="'.$_GET["ligne"].'">';
print '<tr '.$bc[$var].'>';
print '<td>';
+ print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
if ($objp->fk_product > 0)
{
- print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
print '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->fk_product.'">';
if ($objp->fk_product_type) print img_object($langs->trans('ShowService'),'service');
else print img_object($langs->trans('ShowProduct'),'product');
@@ -1489,6 +1515,7 @@ if ($_GET['propalid'] > 0)
print '<table width="100%"><tr><td width="50%" valign="top">';
+ print '<a name="builddoc"></a>'; // ancre
/*
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index c4c8caf093f..4092bc34afb 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -430,13 +430,29 @@ if ($_GET['action'] == 'modif' && $user->rights->commande->creer)
if ($_GET['action'] == 'up' && $user->rights->commande->creer)
{
$commande = new Commande($db,'',$_GET['id']);
+ $commande->fetch($_GET['id']);
$commande->line_up($_GET['rowid']);
+ if ($_REQUEST['lang_id'])
+ {
+ $outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
+ $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+ }
+ commande_pdf_create($db, $commande->id, $commande->modelpdf, $outputlangs);
+ Header ('Location: '.$_SERVER["PHP_SELF"].'?id='.$_GET["id"].'#'.$_GET['rowid']);
}
if ($_GET['action'] == 'down' && $user->rights->commande->creer)
{
$commande = new Commande($db,'',$_GET['id']);
+ $commande->fetch($_GET['id']);
$commande->line_down($_GET['rowid']);
+ if ($_REQUEST['lang_id'])
+ {
+ $outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
+ $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+ }
+ commande_pdf_create($db, $commande->id, $commande->modelpdf, $outputlangs);
+ Header ('Location: '.$_SERVER["PHP_SELF"].'?id='.$_GET["id"].'#'.$_GET['rowid']);
}
if ($_REQUEST['action'] == 'builddoc') // En get ou en post
@@ -465,6 +481,10 @@ if ($_REQUEST['action'] == 'builddoc') // En get ou en post
dolibarr_print_error($db,$result);
exit;
}
+ else
+ {
+ Header ('Location: '.$_SERVER["PHP_SELF"].'?id='.$commande->id.'#builddoc');
+ }
}
// Efface les fichiers
@@ -1208,9 +1228,9 @@ else
print '<td align="right" width="50">'.$langs->trans('Qty').'</td>';
print '<td align="right" width="50">'.$langs->trans('ReductionShort').'</td>';
print '<td align="right" width="50">'.$langs->trans('AmountHT').'</td>';
- print '<td> </td>';
- print '<td> </td>';
- print '<td> </td>';
+ print '<td width="16"> </td>';
+ print '<td width="16"> </td>';
+ print '<td width="16"> </td>';
print "</tr>\n";
}
$var=true;
@@ -1241,6 +1261,7 @@ else
else
{
print '<td>';
+ print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
if (($objp->info_bits & 2) == 2)
{
print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$commande->socidp.'">';
@@ -1321,9 +1342,9 @@ else
print '<input type="hidden" name="elrowid" value="'.$_GET['rowid'].'">';
print '<tr '.$bc[$var].'>';
print '<td>';
+ print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
if ($objp->fk_product > 0)
{
- print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
print '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->fk_product.'">';
if ($objp->fk_product_type) print img_object($langs->trans('ShowService'),'service');
else print img_object($langs->trans('ShowProduct'),'product');
@@ -1639,6 +1660,7 @@ else
print '<table width="100%"><tr><td width="50%" valign="top">';
+ print '<a name="builddoc"></a>'; // ancre
/*
* Documents g�n�r�s
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 924a2f1ae91..918d795da26 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -203,9 +203,15 @@ if ($_POST['action'] == 'confirm_deleteproductline' && $_POST['confirm'] == 'yes
{
if ($user->rights->facture->creer)
{
- $facture = new Facture($db);
- $facture->fetch($_GET['facid']);
- $facture->deleteline($_GET['rowid']);
+ $fac = new Facture($db);
+ $fac->fetch($_GET['facid']);
+ $fac->deleteline($_GET['rowid']);
+ if ($_REQUEST['lang_id'])
+ {
+ $outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
+ $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+ }
+ facture_pdf_create($db, $fac->id, '', $fac->modelpdf, $outputlangs);
}
Header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$_GET['facid']);
exit;
@@ -551,6 +557,12 @@ if ($_GET['action'] == 'deleteline' && $user->rights->facture->creer && !$conf->
$fac = new Facture($db,'',$_GET['facid']);
$fac->fetch($_GET['facid']);
$result = $fac->deleteline($_GET['rowid']);
+ if ($_REQUEST['lang_id'])
+ {
+ $outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
+ $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+ }
+ facture_pdf_create($db, $fac->id, '', $fac->modelpdf, $outputlangs);
}
if ($_POST['action'] == 'confirm_delete' && $_POST['confirm'] == 'yes')
@@ -570,7 +582,7 @@ if ($_POST['action'] == 'confirm_canceled' && $_POST['confirm'] == 'yes')
if ($user->rights->facture->supprimer)
{
$fac = new Facture($db);
- $fac->fetch($_GET['facid']);
+ $fac->fetch($_GET['facid']);
$result = $fac->set_canceled($user);
}
}
@@ -582,13 +594,29 @@ if ($_POST['action'] == 'confirm_canceled' && $_POST['confirm'] == 'yes')
if ($_GET['action'] == 'up' && $user->rights->facture->creer)
{
$fac = new Facture($db,'',$_GET['facid']);
+ $fac->fetch($_GET['facid']);
$fac->line_up($_GET['rowid']);
+ if ($_REQUEST['lang_id'])
+ {
+ $outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
+ $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+ }
+ facture_pdf_create($db, $fac->id, '', $fac->modelpdf, $outputlangs);
+ Header ('Location: '.$_SERVER["PHP_SELF"].'?facid='.$_GET["facid"].'#'.$_GET['rowid']);
}
if ($_GET['action'] == 'down' && $user->rights->facture->creer)
{
$fac = new Facture($db,'',$_GET['facid']);
+ $fac->fetch($_GET['facid']);
$fac->line_down($_GET['rowid']);
+ if ($_REQUEST['lang_id'])
+ {
+ $outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
+ $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+ }
+ facture_pdf_create($db, $fac->id, '', $fac->modelpdf, $outputlangs);
+ Header ('Location: '.$_SERVER["PHP_SELF"].'?facid='.$_GET["facid"].'#'.$_GET['rowid']);
}
/*
@@ -736,12 +764,12 @@ if ($_POST['action'] == 'send' || $_POST['action'] == 'relance')
*/
if ($_REQUEST['action'] == 'builddoc') // En get ou en post
{
- $facture = new Facture($db, 0, $_GET['facid']);
- $facture->fetch($_GET['facid']);
+ $fac = new Facture($db, 0, $_GET['facid']);
+ $fac->fetch($_GET['facid']);
if ($_REQUEST['model'])
{
- $facture->set_pdf_model($user, $_REQUEST['model']);
+ $fac->set_pdf_model($user, $_REQUEST['model']);
}
if ($_REQUEST['lang_id'])
@@ -750,11 +778,15 @@ if ($_REQUEST['action'] == 'builddoc') // En get ou en post
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
}
- $result=facture_pdf_create($db, $facture->id, '', $facture->modelpdf, $outputlangs);
+ $result=facture_pdf_create($db, $fac->id, '', $fac->modelpdf, $outputlangs);
if ($result <= 0)
{
dolibarr_print_error($db,$result);
- exit;
+ exit;
+ }
+ else
+ {
+ Header ('Location: '.$_SERVER["PHP_SELF"].'?facid='.$fac->id.'#builddoc');
}
}
@@ -1772,6 +1804,7 @@ else
else
{
print '<td>';
+ print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
if (($objp->info_bits & 2) == 2)
{
print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$fac->socidp.'">';
@@ -1852,9 +1885,9 @@ else
print '<input type="hidden" name="rowid" value="'.$_GET['rowid'].'">';
print '<tr '.$bc[$var].'>';
print '<td>';
+ print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
if ($objp->fk_product > 0)
{
- print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
print '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->fk_product.'">';
if ($objp->fk_product_type) print img_object($langs->trans('ShowService'),'service');
else print img_object($langs->trans('ShowProduct'),'product');
@@ -2221,6 +2254,7 @@ else
}
print '<table width="100%"><tr><td width="50%" valign="top">';
+ print '<a name="builddoc"></a>'; // ancre
/*
* Documents g�n�r�s
diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index 4311295542d..13fa1ad0951 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -2462,7 +2462,7 @@ class Form
$headershown=1;
- print '<form action="'.$urlsource.'" method="post">';
+ print '<form action="'.$urlsource.'#builddoc" method="post">';
print '<input type="hidden" name="action" value="builddoc">';
print_titre($langs->trans("Documents"));
diff --git a/mysql/data/data.sql b/mysql/data/data.sql
index 91dd15f883a..c8985dd5946 100644
--- a/mysql/data/data.sql
+++ b/mysql/data/data.sql
@@ -515,16 +515,100 @@ insert into llx_c_pays (rowid,code,libelle) values (28, 'MC', 'Monaco' )
insert into llx_c_pays (rowid,code,libelle) values (29, 'AU', 'Australie' );
insert into llx_c_pays (rowid,code,libelle) values (30, 'SG', 'Singapoure' );
insert into llx_c_pays (rowid,code,libelle) values (31, 'AF', 'Afghanistan' );
-insert into llx_c_pays (rowid,code,libelle) values (32, 'AX', 'Aland Islands' );
-insert into llx_c_pays (rowid,code,libelle) values (33, 'AL', 'Albanie' );
-insert into llx_c_pays (rowid,code,libelle) values (34, 'AS', 'American Samoa' );
+insert into llx_c_pays (rowid,code,libelle) values (32, 'AX', 'Iles Aland' );
+insert into llx_c_pays (rowid,code,libelle) values (33, 'AL', 'Albanie' );
+insert into llx_c_pays (rowid,code,libelle) values (34, 'AS', 'Samoa am�ricaines');
insert into llx_c_pays (rowid,code,libelle) values (35, 'AD', 'Andorre' );
insert into llx_c_pays (rowid,code,libelle) values (36, 'AO', 'Angola' );
-insert into llx_c_pays (rowid,code,libelle) values (37, 'AI', 'Anguilla' );
-insert into llx_c_pays (rowid,code,libelle) values (38, 'AQ', 'Antartique' );
-insert into llx_c_pays (rowid,code,libelle) values (39, 'AG', 'Antigua et Barbuda');
-insert into llx_c_pays (rowid,code,libelle) values (40, 'AM', 'Armenie' );
-insert into llx_c_pays (rowid,code,libelle) values (41, 'AW', 'Aruba' );
+insert into llx_c_pays (rowid,code,libelle) values (37, 'AI', 'Anguilla' );
+insert into llx_c_pays (rowid,code,libelle) values (38, 'AQ', 'Antarctique' );
+insert into llx_c_pays (rowid,code,libelle) values (39, 'AG', 'Antigua-et-Barbuda');
+insert into llx_c_pays (rowid,code,libelle) values (40, 'AM', 'Arm�nie' );
+insert into llx_c_pays (rowid,code,libelle) values (41, 'AW', 'Aruba' );
+insert into llx_c_pays (rowid,code,libelle) values (42, 'AT', 'Autriche' );
+insert into llx_c_pays (rowid,code,libelle) values (43, 'AZ', 'Azerba�djan' );
+insert into llx_c_pays (rowid,code,libelle) values (44, 'BS', 'Bahamas' );
+insert into llx_c_pays (rowid,code,libelle) values (45, 'BH', 'Bahre�n' );
+insert into llx_c_pays (rowid,code,libelle) values (46, 'BD', 'Bangladesh' );
+insert into llx_c_pays (rowid,code,libelle) values (47, 'BB', 'Barbade' );
+insert into llx_c_pays (rowid,code,libelle) values (48, 'BY', 'Bi�lorussie' );
+insert into llx_c_pays (rowid,code,libelle) values (49, 'BZ', 'Belize' );
+insert into llx_c_pays (rowid,code,libelle) values (50, 'BJ', 'B�nin' );
+insert into llx_c_pays (rowid,code,libelle) values (51, 'BM', 'Bermudes' );
+insert into llx_c_pays (rowid,code,libelle) values (52, 'BT', 'Bhoutan' );
+insert into llx_c_pays (rowid,code,libelle) values (53, 'BO', 'Bolivie' );
+insert into llx_c_pays (rowid,code,libelle) values (54, 'BA', 'Bosnie-Herz�govine');
+insert into llx_c_pays (rowid,code,libelle) values (55, 'BW', 'Botswana' );
+insert into llx_c_pays (rowid,code,libelle) values (56, 'BV', 'Ile Bouvet' );
+insert into llx_c_pays (rowid,code,libelle) values (57, 'BR', 'Br�sil' );
+insert into llx_c_pays (rowid,code,libelle) values (58, 'IO', 'Territoire britannique de l\'Oc�an Indien');
+insert into llx_c_pays (rowid,code,libelle) values (59, 'BN', 'Brunei' );
+insert into llx_c_pays (rowid,code,libelle) values (60, 'BG', 'Bulgarie' );
+insert into llx_c_pays (rowid,code,libelle) values (61, 'BF', 'Burkina Faso' );
+insert into llx_c_pays (rowid,code,libelle) values (62, 'BI', 'Burundi' );
+insert into llx_c_pays (rowid,code,libelle) values (63, 'KH', 'Cambodge' );
+insert into llx_c_pays (rowid,code,libelle) values (64, 'CV', 'Cap-Vert' );
+insert into llx_c_pays (rowid,code,libelle) values (65, 'KY', 'Iles Cayman' );
+insert into llx_c_pays (rowid,code,libelle) values (66, 'CF', 'R�publique centrafricaine');
+insert into llx_c_pays (rowid,code,libelle) values (67, 'TD', 'Tchad' );
+insert into llx_c_pays (rowid,code,libelle) values (68, 'CL', 'Chili' );
+insert into llx_c_pays (rowid,code,libelle) values (69, 'CX', 'Ile Christmas' );
+insert into llx_c_pays (rowid,code,libelle) values (70, 'CC', 'Iles des Cocos (Keeling)');
+insert into llx_c_pays (rowid,code,libelle) values (71, 'CO', 'Colombie' );
+insert into llx_c_pays (rowid,code,libelle) values (72, 'KM', 'Comores' );
+insert into llx_c_pays (rowid,code,libelle) values (73, 'CG', 'Congo' );
+insert into llx_c_pays (rowid,code,libelle) values (74, 'CD', 'R�publique d�mocratique du Congo');
+insert into llx_c_pays (rowid,code,libelle) values (75, 'CK', 'Iles Cook' );
+insert into llx_c_pays (rowid,code,libelle) values (76, 'CR', 'Costa Rica' );
+insert into llx_c_pays (rowid,code,libelle) values (77, 'HR', 'Croatie' );
+insert into llx_c_pays (rowid,code,libelle) values (78, 'CU', 'Cuba' );
+insert into llx_c_pays (rowid,code,libelle) values (79, 'CY', 'Chypre' );
+insert into llx_c_pays (rowid,code,libelle) values (80, 'CZ', 'R�publique Tch�que');
+insert into llx_c_pays (rowid,code,libelle) values (81, 'DK', 'Danemark' );
+insert into llx_c_pays (rowid,code,libelle) values (82, 'DJ', 'Djibouti' );
+insert into llx_c_pays (rowid,code,libelle) values (83, 'DM', 'Dominique' );
+insert into llx_c_pays (rowid,code,libelle) values (84, 'DO', 'R�publique Dominicaine');
+insert into llx_c_pays (rowid,code,libelle) values (85, 'EC', 'Equateur' );
+insert into llx_c_pays (rowid,code,libelle) values (86, 'EG', 'Egypte' );
+insert into llx_c_pays (rowid,code,libelle) values (87, 'SV', 'Salvador' );
+insert into llx_c_pays (rowid,code,libelle) values (88, 'GQ', 'Guin�e Equatoriale');
+insert into llx_c_pays (rowid,code,libelle) values (89, 'ER', 'Erythr�e' );
+insert into llx_c_pays (rowid,code,libelle) values (90, 'EE', 'Estonie' );
+insert into llx_c_pays (rowid,code,libelle) values (91, 'ET', 'Ethiopie' );
+insert into llx_c_pays (rowid,code,libelle) values (92, 'FK', 'Iles Falkland' );
+insert into llx_c_pays (rowid,code,libelle) values (93, 'FO', 'Iles F�ro�' );
+insert into llx_c_pays (rowid,code,libelle) values (94, 'FJ', 'Iles Fidji' );
+insert into llx_c_pays (rowid,code,libelle) values (95, 'FI', 'Finlande' );
+insert into llx_c_pays (rowid,code,libelle) values (96, 'GF', 'Guyane fran�aise');
+insert into llx_c_pays (rowid,code,libelle) values (97, 'PF', 'Polyn�sie fran�aise');
+insert into llx_c_pays (rowid,code,libelle) values (98, 'TF', 'Terres australes fran�aises');
+insert into llx_c_pays (rowid,code,libelle) values (99, 'GM', 'Gambie' );
+insert into llx_c_pays (rowid,code,libelle) values (100, 'GE', 'G�orgie' );
+insert into llx_c_pays (rowid,code,libelle) values (101, 'GH', 'Ghana' );
+insert into llx_c_pays (rowid,code,libelle) values (102, 'GI', 'Gibraltar' );
+insert into llx_c_pays (rowid,code,libelle) values (103, 'GR', 'Gr�ce' );
+insert into llx_c_pays (rowid,code,libelle) values (104, 'GL', 'Groenland' );
+insert into llx_c_pays (rowid,code,libelle) values (105, 'GD', 'Grenade' );
+insert into llx_c_pays (rowid,code,libelle) values (106, 'GP', 'Guadeloupe' );
+insert into llx_c_pays (rowid,code,libelle) values (107, 'GU', 'Guam' );
+insert into llx_c_pays (rowid,code,libelle) values (108, 'GT', 'Guatemala' );
+insert into llx_c_pays (rowid,code,libelle) values (109, 'GN', 'Guin�e' );
+insert into llx_c_pays (rowid,code,libelle) values (110, 'GW', 'Guin�e-Bissao' );
+insert into llx_c_pays (rowid,code,libelle) values (111, 'GQ', 'Guin�e �quatoriale');
+insert into llx_c_pays (rowid,code,libelle) values (112, 'GY', 'Guyana' );
+insert into llx_c_pays (rowid,code,libelle) values (113, 'GF', 'Guyane fran�aise');
+insert into llx_c_pays (rowid,code,libelle) values (114, 'HT', 'Ha�ti' );
+insert into llx_c_pays (rowid,code,libelle) values (115, 'HM', 'Iles Heard et McDonald');
+insert into llx_c_pays (rowid,code,libelle) values (116, 'VA', 'Saint-Si�ge (Vatican)');
+insert into llx_c_pays (rowid,code,libelle) values (117, 'HN', 'Honduras' );
+insert into llx_c_pays (rowid,code,libelle) values (118, 'HK', 'Hong Kong' );
+insert into llx_c_pays (rowid,code,libelle) values (119, 'IS', 'Islande' );
+insert into llx_c_pays (rowid,code,libelle) values (120, 'IN', 'Inde' );
+insert into llx_c_pays (rowid,code,libelle) values (121, 'ID', 'Indon�sie' );
+insert into llx_c_pays (rowid,code,libelle) values (122, 'IR', 'Iran' );
+insert into llx_c_pays (rowid,code,libelle) values (123, 'IQ', 'Iraq' );
+insert into llx_c_pays (rowid,code,libelle) values (124, 'IL', 'Isra�l' );
+insert into llx_c_pays (rowid,code,libelle) values (125, 'JM', 'Jama�que' );
--
diff --git a/mysql/migration/2.0.0-2.1.0.sql b/mysql/migration/2.0.0-2.1.0.sql
index 3d378c48229..70f1616f6a8 100644
--- a/mysql/migration/2.0.0-2.1.0.sql
+++ b/mysql/migration/2.0.0-2.1.0.sql
@@ -326,3 +326,5 @@ alter table llx_commande_fournisseur drop column fk_soc_contact;
alter table llx_commande drop column fk_soc_contact;
alter table llx_livraison drop column fk_soc_contact;
alter table llx_propal drop column fk_soc_contact;
+
+alter table llx_c_pays modify libelle varchar(50) NOT NULL;
\ No newline at end of file
diff --git a/mysql/tables/llx_c_pays.sql b/mysql/tables/llx_c_pays.sql
index 019f604d717..208f0fa9fe3 100644
--- a/mysql/tables/llx_c_pays.sql
+++ b/mysql/tables/llx_c_pays.sql
@@ -26,6 +26,6 @@ create table llx_c_pays
rowid integer PRIMARY KEY,
code varchar(2) NOT NULL,
code_iso varchar(3) ,
- libelle varchar(25) NOT NULL,
+ libelle varchar(50) NOT NULL,
active tinyint DEFAULT 1 NOT NULL
)type=innodb;
--
GitLab