diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php
index d3e7691f05a..c7b4ca8e556 100644
--- a/htdocs/compta/deplacement/class/deplacement.class.php
+++ b/htdocs/compta/deplacement/class/deplacement.class.php
@@ -177,6 +177,7 @@ class Deplacement extends CommonObject
$sql .= " SET km = ".$this->km; // This is a distance or amount
$sql .= " , dated = '".$this->db->idate($this->date)."'";
$sql .= " , type = '".$this->type."'";
+ $sql .= " , fk_statut = '".$this->fk_statut."'";
$sql .= " , fk_user = ".$this->fk_user;
$sql .= " , fk_user_modif = ".$user->id;
$sql .= " , fk_soc = ".($this->socid > 0?$this->socid:'null');
diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php
index 14c965373ed..eac993909f1 100644
--- a/htdocs/compta/deplacement/fiche.php
+++ b/htdocs/compta/deplacement/fiche.php
@@ -51,6 +51,64 @@ $object = new Deplacement($db);
/*
* Actions
*/
+if ($action == 'block' && $user->rights->deplacement->valider)
+{
+ $object->fetch($id);
+ if ($object->fk_statut == '2') // Already blocked...
+ {
+ $mesg=''.$langs->trans("Error").'
';
+ $action='';
+ $error++;
+ }
+ else
+ {
+ $result = $object->fetch($id);
+
+ $object->fk_statut = '2';
+
+ $result = $object->update($user);
+
+ if ($result > 0)
+ {
+ Header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
+ exit;
+ }
+ else
+ {
+ $mesg=$object->error;
+ }
+ }
+}
+
+if ($action == 'unblock' && $user->rights->deplacement->unvalidate)
+{
+ $object->fetch($id);
+ if ($object->fk_statut == '1') // Not blocked...
+ {
+ $mesg=''.$langs->trans("Error").'
';
+ $action='';
+ $error++;
+ }
+ else
+ {
+ $result = $object->fetch($id);
+
+ $object->fk_statut = '1';
+
+ $result = $object->update($user);
+
+ if ($result > 0)
+ {
+ Header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
+ exit;
+ }
+ else
+ {
+ $mesg=$object->error;
+ }
+ }
+}
+
if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->deplacement->supprimer)
{
$result=$object->delete($id);
@@ -473,23 +531,44 @@ else if ($id)
print '';
}
}
diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index 857bc2e4653..b7d06d10ff5 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -163,15 +163,37 @@ function show_list_sending_receive($origin='commande',$origin_id,$filter='')
// Description
if ($objp->fk_product > 0)
{
+ // Define output language
+ if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+ {
+ $object = new $origin($db);
+ $object->fetch($origin_id);
+ $object->fetch_thirdparty();
+ $prod = new Product($db, $objp->fk_product);
+ $outputlangs = $langs;
+ $newlang='';
+ if (empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
+ if (empty($newlang)) $newlang=$object->client->default_lang;
+ if (! empty($newlang))
+ {
+ $outputlangs = new Translate("",$conf);
+ $outputlangs->setDefaultLang($newlang);
+ }
+
+ $label = (! empty($prod->multilangs[$outputlangs->defaultlang]["libelle"])) ? $prod->multilangs[$outputlangs->defaultlang]["libelle"] : $objp->product;
+ }
+ else
+ $label = $objp->product;
+
print '';
// Show product and description
$product_static->type=$objp->fk_product_type;
$product_static->id=$objp->fk_product;
$product_static->ref=$objp->ref;
- $product_static->libelle=$objp->product;
+ $product_static->libelle=$label;
$text=$product_static->getNomUrl(1);
- $text.= ' - '.$objp->product;
+ $text.= ' - '.$label;
$description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($objp->description));
print $form->textwithtooltip($text,$description,3,'','',$i);
diff --git a/htdocs/core/modules/modDeplacement.class.php b/htdocs/core/modules/modDeplacement.class.php
index c75a4cc4abe..fb48f5b0628 100644
--- a/htdocs/core/modules/modDeplacement.class.php
+++ b/htdocs/core/modules/modDeplacement.class.php
@@ -90,17 +90,29 @@ class modDeplacement extends DolibarrModules
$this->rights[2][3] = 0;
$this->rights[2][4] = 'creer';
- $this->rights[3][0] = 173;
+ $this->rights[3][0] = 173;
$this->rights[3][1] = 'Supprimer les deplacements';
$this->rights[3][2] = 'd';
$this->rights[3][3] = 0;
$this->rights[3][4] = 'supprimer';
-
- $this->rights[4][0] = 178;
- $this->rights[4][1] = 'Exporter les deplacements';
- $this->rights[4][2] = 'd';
+
+ $this->rights[4][0] = 174;
+ $this->rights[4][1] = 'Bloquer les deplacements';
+ $this->rights[4][2] = 'a';
$this->rights[4][3] = 0;
- $this->rights[4][4] = 'export';
+ $this->rights[4][4] = 'valider';
+
+ $this->rights[5][0] = 175;
+ $this->rights[5][1] = 'Debloquer les deplacements';
+ $this->rights[5][2] = 'a';
+ $this->rights[5][3] = 0;
+ $this->rights[5][4] = 'unvalidate';
+
+ $this->rights[6][0] = 178;
+ $this->rights[6][1] = 'Exporter les deplacements';
+ $this->rights[6][2] = 'd';
+ $this->rights[6][3] = 0;
+ $this->rights[6][4] = 'export';
// Exports
$r=0;
diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index 2b8c8495126..fa93422cec4 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -1145,6 +1145,26 @@ else
// Predefined product or service
if ($lines[$i]->fk_product > 0)
{
+ // Define output language
+ if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+ {
+ $object->fetch_thirdparty();
+ $prod = new Product($db, $lines[$i]->fk_product);
+ $outputlangs = $langs;
+ $newlang='';
+ if (empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
+ if (empty($newlang)) $newlang=$object->client->default_lang;
+ if (! empty($newlang))
+ {
+ $outputlangs = new Translate("",$conf);
+ $outputlangs->setDefaultLang($newlang);
+ }
+
+ $label = ( ! empty($prod->multilangs[$outputlangs->defaultlang]["libelle"])) ? $prod->multilangs[$outputlangs->defaultlang]["libelle"] : $lines[$i]->product_label;
+ }
+ else
+ $label = $lines[$i]->product_label;
+
print ' | ';
// Affiche ligne produit
@@ -1152,7 +1172,7 @@ else
if ($lines[$i]->fk_product_type==1) $text.= img_object($langs->trans('ShowService'),'service');
else $text.= img_object($langs->trans('ShowProduct'),'product');
$text.= ' '.$lines[$i]->ref.'';
- $text.= ' - '.$lines[$i]->label;
+ $text.= ' - '.$label;
$description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($lines[$i]->description));
//print $description;
print $form->textwithtooltip($text,$description,3,'','',$i);
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index f92de82038f..e114a6a9082 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -440,6 +440,26 @@ if ($id > 0 || ! empty($ref))
// Product label
if ($objp->fk_product > 0)
{
+ // Define output language
+ if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+ {
+ $commande->fetch_thirdparty();
+ $prod = new Product($db, $objp->fk_product);
+ $outputlangs = $langs;
+ $newlang='';
+ if (empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
+ if (empty($newlang)) $newlang=$commande->client->default_lang;
+ if (! empty($newlang))
+ {
+ $outputlangs = new Translate("",$conf);
+ $outputlangs->setDefaultLang($newlang);
+ }
+
+ $label = (! empty($prod->multilangs[$outputlangs->defaultlang]["libelle"])) ? $prod->multilangs[$outputlangs->defaultlang]["libelle"] : $objp->product_label;
+ }
+ else
+ $label = $objp->product_label;
+
print ' | ';
print ''; // ancre pour retourner sur la ligne
@@ -447,9 +467,9 @@ if ($id > 0 || ! empty($ref))
$product_static->type=$objp->fk_product_type;
$product_static->id=$objp->fk_product;
$product_static->ref=$objp->ref;
- $product_static->libelle=$objp->product_label;
+ $product_static->libelle=$label;
$text=$product_static->getNomUrl(1);
- $text.= ' - '.$objp->product_label;
+ $text.= ' - '.$label;
$description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($objp->description));
print $form->textwithtooltip($text,$description,3,'','',$i);
diff --git a/htdocs/install/mysql/data/llx_accounting.sql b/htdocs/install/mysql/data/llx_accounting.sql
index 0bf7b06c04c..1e0da1af8a0 100644
--- a/htdocs/install/mysql/data/llx_accounting.sql
+++ b/htdocs/install/mysql/data/llx_accounting.sql
@@ -5,6 +5,7 @@
-- Copyright (C) 2004 Guillaume Delecourt
-- Copyright (C) 2005-2009 Regis Houssin
-- Copyright (C) 2007 Patrick Raguin
+-- Copyright (C) 2011 Alexandre Spangaro
--
-- 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
@@ -26,13 +27,13 @@
-- de l'install et tous les sigles '--' sont supprimés.
--
+delete from llx_accountingaccount;
+delete from llx_accountingsystem;
+
--
-- Descriptif des plans comptables FR PCG99-ABREGE
--
-delete from llx_accountingaccount;
-delete from llx_accountingsystem;
-
insert into llx_accountingsystem (pcg_version, fk_pays, label, datec, fk_author, active) VALUES ('PCG99-ABREGE', 1, 'The simple accountancy french plan', CURRENT_DATE, null, 0);
insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 1,'PCG99-ABREGE','CAPIT', 'CAPITAL', '101', '1', 'Capital');
@@ -137,3 +138,153 @@ insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype,
insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (100,'PCG99-ABREGE','PROD', 'XXXXXX', '786', '7', 'Reprises sur provisions pour risques');
insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (101,'PCG99-ABREGE','PROD', 'XXXXXX', '787', '7', 'Reprises sur provisions');
insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (102,'PCG99-ABREGE','PROD', 'XXXXXX', '79', '7', 'Transferts de charges');
+
+--
+-- Descriptif des plans comptables FR PCG99-BASE
+--
+
+insert into llx_accountingsystem (pcg_version, fk_pays, label, datec, fk_author, active) VALUES ('PCG99-BASE', 1, 'The base accountancy french plan', CURRENT_DATE, null, 0);
+
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (103,'PCG99-BASE','CAPIT', 'XXXXXX', '10', '1', 'Capital et réserves');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (104,'PCG99-BASE','CAPIT', 'CAPITAL', '101', '10', 'Capital');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (105,'PCG99-BASE','CAPIT', 'XXXXXX', '104', '10', 'Primes liées au capital social');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (106,'PCG99-BASE','CAPIT', 'XXXXXX', '105', '10', 'Ecarts de réévaluation');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (107,'PCG99-BASE','CAPIT', 'XXXXXX', '106', '10', 'Réserves');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (108,'PCG99-BASE','CAPIT', 'XXXXXX', '107', '10', 'Ecart d''equivalence');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (109,'PCG99-BASE','CAPIT', 'XXXXXX', '108', '10', 'Compte de l''exploitant');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (110,'PCG99-BASE','CAPIT', 'XXXXXX', '109', '10', 'Actionnaires : capital souscrit - non appelé');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (111,'PCG99-BASE','CAPIT', 'XXXXXX', '11', '1', 'Report à nouveau (solde créditeur ou débiteur)');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (112,'PCG99-BASE','CAPIT', 'XXXXXX', '110', '11', 'Report à nouveau (solde créditeur)');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (113,'PCG99-BASE','CAPIT', 'XXXXXX', '119', '11', 'Report à nouveau (solde débiteur)');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (114,'PCG99-BASE','CAPIT', 'XXXXXX', '12', '1', 'Résultat de l''exercice (bénéfice ou perte)');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (115,'PCG99-BASE','CAPIT', 'XXXXXX', '120', '12', 'Résultat de l''exercice (bénéfice)');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (116,'PCG99-BASE','CAPIT', 'XXXXXX', '129', '12', 'Résultat de l''exercice (perte)');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (117,'PCG99-BASE','CAPIT', 'XXXXXX', '13', '1', 'Subventions d''investissement');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (118,'PCG99-BASE','CAPIT', 'XXXXXX', '131', '13', 'Subventions d''équipement');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (119,'PCG99-BASE','CAPIT', 'XXXXXX', '138', '13', 'Autres subventions d''investissement');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (120,'PCG99-BASE','CAPIT', 'XXXXXX', '139', '13', 'Subventions d''investissement inscrites au compte de résultat');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (121,'PCG99-BASE','CAPIT', 'XXXXXX', '14', '1', 'Provisions réglementées');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (122,'PCG99-BASE','CAPIT', 'XXXXXX', '142', '14', 'Provisions réglementées relatives aux immobilisations');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (123,'PCG99-BASE','CAPIT', 'XXXXXX', '143', '14', 'Provisions réglementées relatives aux stocks');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (124,'PCG99-BASE','CAPIT', 'XXXXXX', '144', '14', 'Provisions réglementées relatives aux autres éléments de l''actif');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (125,'PCG99-BASE','CAPIT', 'XXXXXX', '145', '14', 'Amortissements dérogatoires');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (126,'PCG99-BASE','CAPIT', 'XXXXXX', '146', '14', 'Provision spéciale de réévaluation');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (127,'PCG99-BASE','CAPIT', 'XXXXXX', '147', '14', 'Plus-values réinvesties');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (128,'PCG99-BASE','CAPIT', 'XXXXXX', '148', '14', 'Autres provisions réglementées');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (129,'PCG99-BASE','CAPIT', 'XXXXXX', '15', '1', 'Provisions pour risques et charges');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (130,'PCG99-BASE','CAPIT', 'XXXXXX', '151', '15', 'Provisions pour risques');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (131,'PCG99-BASE','CAPIT', 'XXXXXX', '153', '15', 'Provisions pour pensions et obligations similaires');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (132,'PCG99-BASE','CAPIT', 'XXXXXX', '154', '15', 'Provisions pour restructurations');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (133,'PCG99-BASE','CAPIT', 'XXXXXX', '155', '15', 'Provisions pour impôts');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (134,'PCG99-BASE','CAPIT', 'XXXXXX', '156', '15', 'Provisions pour renouvellement des immobilisations (entreprises concessionnaires)');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (135,'PCG99-BASE','CAPIT', 'XXXXXX', '157', '15', 'Provisions pour charges à répartir sur plusieurs exercices');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (136,'PCG99-BASE','CAPIT', 'XXXXXX', '158', '15', 'Autres provisions pour charges');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (137,'PCG99-BASE','CAPIT', 'XXXXXX', '16', '1', 'Emprunts et dettes assimilees');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (138,'PCG99-BASE','CAPIT', 'XXXXXX', '161', '16', 'Emprunts obligataires convertibles');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (139,'PCG99-BASE','CAPIT', 'XXXXXX', '163', '16', 'Autres emprunts obligataires');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (140,'PCG99-BASE','CAPIT', 'XXXXXX', '164', '16', 'Emprunts auprès des établissements de crédit');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (141,'PCG99-BASE','CAPIT', 'XXXXXX', '165', '16', 'Dépôts et cautionnements reçus');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (142,'PCG99-BASE','CAPIT', 'XXXXXX', '166', '16', 'Participation des salariés aux résultats');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (143,'PCG99-BASE','CAPIT', 'XXXXXX', '167', '16', 'Emprunts et dettes assortis de conditions particulières');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (144,'PCG99-BASE','CAPIT', 'XXXXXX', '168', '16', 'Autres emprunts et dettes assimilées');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (145,'PCG99-BASE','CAPIT', 'XXXXXX', '169', '16', 'Primes de remboursement des obligations');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (146,'PCG99-BASE','CAPIT', 'XXXXXX', '17', '1', 'Dettes rattachées à des participations');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (147,'PCG99-BASE','CAPIT', 'XXXXXX', '171', '17', 'Dettes rattachées à des participations (groupe)');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (148,'PCG99-BASE','CAPIT', 'XXXXXX', '174', '17', 'Dettes rattachées à des participations (hors groupe)');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (149,'PCG99-BASE','CAPIT', 'XXXXXX', '178', '17', 'Dettes rattachées à des sociétés en participation');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (150,'PCG99-BASE','CAPIT', 'XXXXXX', '18', '1', 'Comptes de liaison des établissements et sociétés en participation');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (151,'PCG99-BASE','CAPIT', 'XXXXXX', '181', '18', 'Comptes de liaison des établissements');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (152,'PCG99-BASE','CAPIT', 'XXXXXX', '186', '18', 'Biens et prestations de services échangés entre établissements (charges)');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (153,'PCG99-BASE','CAPIT', 'XXXXXX', '187', '18', 'Biens et prestations de services échangés entre établissements (produits)');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (154,'PCG99-BASE','CAPIT', 'XXXXXX', '188', '18', 'Comptes de liaison des sociétés en participation');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (155,'PCG99-BASE','IMMO', 'XXXXXX', '20', '2', 'Immobilisations incorporelles');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (156,'PCG99-BASE','IMMO', 'XXXXXX', '201', '20', 'Frais d''établissement');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (157,'PCG99-BASE','IMMO', 'XXXXXX', '203', '20', 'Frais de recherche et de développement');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (158,'PCG99-BASE','IMMO', 'XXXXXX', '205', '20', 'Concessions et droits similaires, brevets, licences, marques, procédés, logiciels, droits et valeurs similaires');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (159,'PCG99-BASE','IMMO', 'XXXXXX', '206', '20', 'Droit au bail');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (160,'PCG99-BASE','IMMO', 'XXXXXX', '207', '20', 'Fonds commercial');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (161,'PCG99-BASE','IMMO', 'XXXXXX', '208', '20', 'Autres immobilisations incorporelles');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (162,'PCG99-BASE','IMMO', 'XXXXXX', '21', '2', 'Immobilisations corporelles');
+
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 21,'PCG99-BASE','IMMO', 'XXXXXX', '23', '2', 'Immobilisations en cours');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 22,'PCG99-BASE','IMMO', 'XXXXXX', '27', '2', 'Autres immobilisations financieres');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 23,'PCG99-BASE','IMMO', 'XXXXXX', '280', '2', 'Amortissements des immobilisations incorporelles');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 24,'PCG99-BASE','IMMO', 'XXXXXX', '281', '2', 'Amortissements des immobilisations corporelles');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 25,'PCG99-BASE','IMMO', 'XXXXXX', '290', '2', 'Provisions pour dépréciation des immobilisations incorporelles');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 26,'PCG99-BASE','IMMO', 'XXXXXX', '291', '2', 'Provisions pour dépréciation des immobilisations corporelles');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 27,'PCG99-BASE','IMMO', 'XXXXXX', '297', '2', 'Provisions pour dépréciation des autres immobilisations financières');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 28,'PCG99-BASE','STOCK', 'XXXXXX', '31', '3', 'Matieres premières');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 29,'PCG99-BASE','STOCK', 'XXXXXX', '32', '3', 'Autres approvisionnements');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 30,'PCG99-BASE','STOCK', 'XXXXXX', '33', '3', 'En-cours de production de biens');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 31,'PCG99-BASE','STOCK', 'XXXXXX', '34', '3', 'En-cours de production de services');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 32,'PCG99-BASE','STOCK', 'XXXXXX', '35', '3', 'Stocks de produits');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 33,'PCG99-BASE','STOCK', 'XXXXXX', '37', '3', 'Stocks de marchandises');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 34,'PCG99-BASE','STOCK', 'XXXXXX', '391', '3', 'Provisions pour dépréciation des matières premières');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 35,'PCG99-BASE','STOCK', 'XXXXXX', '392', '3', 'Provisions pour dépréciation des autres approvisionnements');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 36,'PCG99-BASE','STOCK', 'XXXXXX', '393', '3', 'Provisions pour dépréciation des en-cours de production de biens');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 37,'PCG99-BASE','STOCK', 'XXXXXX', '394', '3', 'Provisions pour dépréciation des en-cours de production de services');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 38,'PCG99-BASE','STOCK', 'XXXXXX', '395', '3', 'Provisions pour dépréciation des stocks de produits');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 39,'PCG99-BASE','STOCK', 'XXXXXX', '397', '3', 'Provisions pour dépréciation des stocks de marchandises');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 40,'PCG99-BASE','TIERS', 'SUPPLIER','400', '4', 'Fournisseurs et Comptes rattachés');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 41,'PCG99-BASE','TIERS', 'XXXXXX', '409', '4', 'Fournisseurs débiteurs');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 42,'PCG99-BASE','TIERS', 'CUSTOMER','410', '4', 'Clients et Comptes rattachés');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 43,'PCG99-BASE','TIERS', 'XXXXXX', '419', '4', 'Clients créditeurs');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 44,'PCG99-BASE','TIERS', 'XXXXXX', '421', '4', 'Personnel');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 45,'PCG99-BASE','TIERS', 'XXXXXX', '428', '4', 'Personnel');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 46,'PCG99-BASE','TIERS', 'XXXXXX', '43', '4', 'Sécurité sociale et autres organismes sociaux');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 47,'PCG99-BASE','TIERS', 'XXXXXX', '444', '4', 'Etat - impôts sur bénéfice');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 48,'PCG99-BASE','TIERS', 'XXXXXX', '445', '4', 'Etat - Taxes sur chiffre affaire');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 49,'PCG99-BASE','TIERS', 'XXXXXX', '447', '4', 'Autres impôts, taxes et versements assimilés');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 50,'PCG99-BASE','TIERS', 'XXXXXX', '45', '4', 'Groupe et associes');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 51,'PCG99-BASE','TIERS', 'XXXXXX', '455','45', 'Associés');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 52,'PCG99-BASE','TIERS', 'XXXXXX', '46', '4', 'Débiteurs divers et créditeurs divers');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 53,'PCG99-BASE','TIERS', 'XXXXXX', '47', '4', 'Comptes transitoires ou d''attente');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 54,'PCG99-BASE','TIERS', 'XXXXXX', '481', '4', 'Charges à répartir sur plusieurs exercices');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 55,'PCG99-BASE','TIERS', 'XXXXXX', '486', '4', 'Charges constatées d''avance');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 56,'PCG99-BASE','TIERS', 'XXXXXX', '487', '4', 'Produits constatés d''avance');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 57,'PCG99-BASE','TIERS', 'XXXXXX', '491', '4', 'Provisions pour dépréciation des comptes de clients');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 58,'PCG99-BASE','TIERS', 'XXXXXX', '496', '4', 'Provisions pour dépréciation des comptes de débiteurs divers');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 59,'PCG99-BASE','FINAN', 'XXXXXX', '50', '5', 'Valeurs mobilières de placement');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 60,'PCG99-BASE','FINAN', 'BANK', '51', '5', 'Banques, établissements financiers et assimilés');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 61,'PCG99-BASE','FINAN', 'CASH', '53', '5', 'Caisse');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 62,'PCG99-BASE','FINAN', 'XXXXXX', '54', '5', 'Régies d''avance et accréditifs');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 63,'PCG99-BASE','FINAN', 'XXXXXX', '58', '5', 'Virements internes');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 64,'PCG99-BASE','FINAN', 'XXXXXX', '590', '5', 'Provisions pour dépréciation des valeurs mobilières de placement');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 65,'PCG99-BASE','CHARGE','PRODUCT', '60', '6', 'Achats');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 66,'PCG99-BASE','CHARGE','XXXXXX', '603','60', 'Variations des stocks');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 67,'PCG99-BASE','CHARGE','SERVICE', '61', '6', 'Services extérieurs');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 68,'PCG99-BASE','CHARGE','XXXXXX', '62', '6', 'Autres services extérieurs');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 69,'PCG99-BASE','CHARGE','XXXXXX', '63', '6', 'Impôts, taxes et versements assimiles');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 70,'PCG99-BASE','CHARGE','XXXXXX', '641', '6', 'Rémunérations du personnel');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 71,'PCG99-BASE','CHARGE','XXXXXX', '644', '6', 'Rémunération du travail de l''exploitant');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 72,'PCG99-BASE','CHARGE','SOCIAL', '645', '6', 'Charges de sécurité sociale et de prévoyance');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 73,'PCG99-BASE','CHARGE','XXXXXX', '646', '6', 'Cotisations sociales personnelles de l''exploitant');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 74,'PCG99-BASE','CHARGE','XXXXXX', '65', '6', 'Autres charges de gestion courante');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 75,'PCG99-BASE','CHARGE','XXXXXX', '66', '6', 'Charges financières');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 76,'PCG99-BASE','CHARGE','XXXXXX', '67', '6', 'Charges exceptionnelles');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 77,'PCG99-BASE','CHARGE','XXXXXX', '681', '6', 'Dotations aux amortissements et aux provisions');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 78,'PCG99-BASE','CHARGE','XXXXXX', '686', '6', 'Dotations aux amortissements et aux provisions');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 79,'PCG99-BASE','CHARGE','XXXXXX', '687', '6', 'Dotations aux amortissements et aux provisions');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 80,'PCG99-BASE','CHARGE','XXXXXX', '691', '6', 'Participation des salariés aux résultats');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 81,'PCG99-BASE','CHARGE','XXXXXX', '695', '6', 'Impôts sur les bénéfices');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 82,'PCG99-BASE','CHARGE','XXXXXX', '697', '6', 'Imposition forfaitaire annuelle des sociétés');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 83,'PCG99-BASE','CHARGE','XXXXXX', '699', '6', 'Produits');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 84,'PCG99-BASE','PROD', 'PRODUCT', '701', '7', 'Ventes de produits finis');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 85,'PCG99-BASE','PROD', 'SERVICE', '706', '7', 'Prestations de services');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 86,'PCG99-BASE','PROD', 'PRODUCT', '707', '7', 'Ventes de marchandises');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 87,'PCG99-BASE','PROD', 'PRODUCT', '708', '7', 'Produits des activités annexes');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 88,'PCG99-BASE','PROD', 'XXXXXX', '709', '7', 'Rabais, remises et ristournes accordés par l''entreprise');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 89,'PCG99-BASE','PROD', 'XXXXXX', '713', '7', 'Variation des stocks');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 90,'PCG99-BASE','PROD', 'XXXXXX', '72', '7', 'Production immobilisée');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 91,'PCG99-BASE','PROD', 'XXXXXX', '73', '7', 'Produits nets partiels sur opérations à long terme');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 92,'PCG99-BASE','PROD', 'XXXXXX', '74', '7', 'Subventions d''exploitation');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 93,'PCG99-BASE','PROD', 'XXXXXX', '75', '7', 'Autres produits de gestion courante');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 94,'PCG99-BASE','PROD', 'XXXXXX', '753','75', 'Jetons de présence et rémunérations d''administrateurs, gérants,...');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 95,'PCG99-BASE','PROD', 'XXXXXX', '754','75', 'Ristournes perçues des coopératives');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 96,'PCG99-BASE','PROD', 'XXXXXX', '755','75', 'Quotes-parts de résultat sur opérations faites en commun');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 97,'PCG99-BASE','PROD', 'XXXXXX', '76', '7', 'Produits financiers');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 98,'PCG99-BASE','PROD', 'XXXXXX', '77', '7', 'Produits exceptionnels');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES ( 99,'PCG99-BASE','PROD', 'XXXXXX', '781', '7', 'Reprises sur amortissements et provisions');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (100,'PCG99-BASE','PROD', 'XXXXXX', '786', '7', 'Reprises sur provisions pour risques');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (101,'PCG99-BASE','PROD', 'XXXXXX', '787', '7', 'Reprises sur provisions');
+insert into llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label) VALUES (102,'PCG99-BASE','PROD', 'XXXXXX', '79', '7', 'Transferts de charges');
diff --git a/htdocs/install/mysql/data/llx_c_chargesociales.sql b/htdocs/install/mysql/data/llx_c_chargesociales.sql
index 4a4ec51a885..c05f911af1c 100644
--- a/htdocs/install/mysql/data/llx_c_chargesociales.sql
+++ b/htdocs/install/mysql/data/llx_c_chargesociales.sql
@@ -38,6 +38,8 @@ insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays
insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values ( 3, 'CSG/CRDS NON Deductible',0,1,'TAXCSGND' ,'1');
insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values ( 10, 'Taxe apprentissage', 0,1,'TAXAPP' ,'1');
insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values ( 11, 'Taxe professionnelle', 0,1,'TAXPRO' ,'1');
+insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values ( 12, 'Cotisation fonciere des entreprises', 0,1,'TAXCFE' ,'1');
+insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values ( 13, 'Cotisation sur la valeur ajoutee des entreprises', 0,1,'TAXCVAE' ,'1');
insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values ( 20, 'Impots locaux/fonciers', 0,1,'TAXFON' ,'1');
insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values ( 25, 'Impots revenus', 0,1,'TAXREV' ,'1');
insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values ( 30, 'Assurance Sante', 0,1,'TAXSECU' ,'1');
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index b9884aaf3ad..a21a5d1867f 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -122,6 +122,8 @@ Modify=Modifier
Edit=Éditer
Validate=Valider
ToValidate=À valider
+Block=Bloquer
+Unblock=Débloquer
Save=Enregistrer
SaveAs=Enregistrer sous
TestConnection=Tester la connexion
diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php
index 5e03bbec77d..797cfac9125 100644
--- a/htdocs/livraison/fiche.php
+++ b/htdocs/livraison/fiche.php
@@ -308,8 +308,27 @@ if ($_GET["action"] == 'create')
$product->fetch($line->fk_product);
$product->load_stock();
+ // Define output language
+ if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+ {
+ $commande->fetch_thirdparty();
+ $outputlangs = $langs;
+ $newlang='';
+ if (empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
+ if (empty($newlang)) $newlang=$commande->client->default_lang;
+ if (! empty($newlang))
+ {
+ $outputlangs = new Translate("",$conf);
+ $outputlangs->setDefaultLang($newlang);
+ }
+
+ $label = (! empty($product->multilangs[$outputlangs->defaultlang]["libelle"])) ? $product->multilangs[$outputlangs->defaultlang]["libelle"] : $product->libelle;
+ }
+ else
+ $label = $product->libelle;
+
print '| ';
- print ''.img_object($langs->trans("ShowProduct"),"product").' '.$product->ref.' - '.$product->libelle;
+ print ''.img_object($langs->trans("ShowProduct"),"product").' '.$product->ref.' - '.$label;
if ($line->description) print nl2br($line->description);
print ' | ';
}
@@ -530,6 +549,25 @@ else
$product = new Product($db);
$product->fetch($delivery->lines[$i]->fk_product);
+ // Define output language
+ if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+ {
+ $delivery->fetch_thirdparty();
+ $outputlangs = $langs;
+ $newlang='';
+ if (empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
+ if (empty($newlang)) $newlang=$delivery->client->default_lang;
+ if (! empty($newlang))
+ {
+ $outputlangs = new Translate("",$conf);
+ $outputlangs->setDefaultLang($newlang);
+ }
+
+ $label = (! empty($product->multilangs[$outputlangs->defaultlang]["libelle"])) ? $product->multilangs[$outputlangs->defaultlang]["libelle"] : $delivery->lines[$i]->product_label;
+ }
+ else
+ $label = $delivery->lines[$i]->product_label;
+
print '';
// Affiche ligne produit
@@ -537,7 +575,7 @@ else
if ($delivery->lines[$i]->fk_product_type==1) $text.= img_object($langs->trans('ShowService'),'service');
else $text.= img_object($langs->trans('ShowProduct'),'product');
$text.= ' '.$delivery->lines[$i]->ref.'';
- $text.= ' - '.$delivery->lines[$i]->label;
+ $text.= ' - '.$label;
$description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($delivery->lines[$i]->description));
//print $description;
print $form->textwithtooltip($text,$description,3,'','',$i);
| |