Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop

Conflicts: ChangeLog htdocs/core/lib/company.lib.php
2018-09-03 14:06:51 +02:00 · 2018-09-03 14:06:51 +02:00 · 540999faa5
commit 540999faa5
parent c5c0491ea7 47655f0725
33 changed files with 7879 additions and 7868 deletions
--- a/35
+++ b/35
@ -4,7 +4,6 @@ English Dolibarr ChangeLog


 ***** ChangeLog for 9.0.0 compared to 8.0.0 *****
-
 For Users:
 NEW: Stable module: Website
 NEW: Stable module: WebDAV
@ -17,8 +16,40 @@ For developers:
 * Removed trigger USER_LOGOUT, USER_LOGIN, USER_LOGIN_FAILED (Some hooks are already dedicated for that)


-***** ChangeLog for 8.0.0 compared to 7.0.0 *****

+***** ChangeLog for 8.0.1 compared to 8.0.0 *****
+FIX: #9258
+FIX: #9328
+FIX: #9337
+FIX: adding GROUP BY for PostgreSQL
+FIX: API template for list pages in module builder
+FIX: API template for record page to delete a record
+FIX: a removed option was still in setup
+FIX: badge on time spent on project and tasks
+FIX: Delete file on smartphone
+FIX: Fetch function will fetch comments
+FIX: Fetch task will now fetch comments
+FIX: $fk_account is always empty, must be $soc->fk_account
+FIX: Force stripe api version to avoid trouble if we update stripe api
+FIX: get_product_vat_for_country functions.lib.php
+FIX: Get templates in a forced language
+FIX: hook on dispatch order fourn
+FIX: Language selection lost if error during creation of email template
+FIX: Look and feel v8
+FIX: propal.class.php
+FIX: Add calls to fetchComments function
+FIX: Remove fetchComments from project and task fetch function
+FIX: remove internal property isextrafieldmanaged from API returns
+FIX: sql error
+FIX: table llx_chargessociales doesn't exists
+FIX: trans on null object
+FIX: vat rate code not returned by get_product_vat_for_country
+FIX: warning for late template invoices to remove when suspended
+FIX: Add hidden option MAIN_xxx_IN_SOURCE_ADDRESS to solve legal issues on PDF
+FIX: Table llx_facture_rec_extrafields missing after migration
+
+
+***** ChangeLog for 8.0.0 compared to 7.0.0 *****
 For Users:
 NEW: Experimental module: Ticket
 NEW: Experimental module: WebDAV
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@ -121,6 +121,9 @@ if (empty($reshook))
 			if ($country_code)
 			{
 				$sqlfile = DOL_DOCUMENT_ROOT.'/install/mysql/data/llx_accounting_account_'.strtolower($country_code).'.sql';
+
+				// FIXME Get the ADD rowid and pass it + num of comapny * 100 000 000 to run_sql as a new parameter to say to update sql on the fly to add offset to rowid and account_parent value.
+
 				$result = run_sql($sqlfile, 1, 0, 1);
 			}

--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@ -1485,13 +1485,14 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
    {
        $delay_warning=$conf->global->MAIN_DELAY_ACTIONS_TODO*24*60*60;

+        require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+        require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
        require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-	    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+        require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';

-	    $formactions=new FormActions($db);
+        $formactions=new FormActions($db);

-	    $actionstatic=new ActionComm($db);
+        $actionstatic=new ActionComm($db);
        $userstatic=new User($db);
        $contactstatic = new Contact($db);

--- a/htdocs/install/mysql/data/llx_accounting_abc.sql
+++ b/htdocs/install/mysql/data/llx_accounting_abc.sql
@ -77,6 +77,8 @@ INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUE
 -- Description of chart of account MA PCG
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 12, 'PCG', 'The Moroccan chart of accounts', 1);

+--DELETE FROM llx_accounting_system WHERE pcg_version = 'SYSCOHADA';
+
 -- Description of chart of account BJ SYSCOHADA
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 49,'SYSCOHADA-BJ', 'Plan comptable Ouest-Africain', 1);

--- a/htdocs/install/mysql/data/llx_accounting_account_be.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_be.sql
@ -20,16 +20,15 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
--

 --
 -- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
 -- de l'install et tous les sigles '--' sont supprimés.
 --

--
 -- Descriptif des plans comptables BE PCMN-BASE
--
+-- ID 439-1357
+-- ADD 200000 to rowid # Do no remove this comment --

 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (439, 'PCMN-BASE', 'CAPIT', 'XXXXXX', '10',  '1351', 'Capital', 1);
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (440, 'PCMN-BASE', 'CAPIT', 'XXXXXX', '100',  '439', 'Capital souscrit ou capital personnel', 1);
--- a/htdocs/install/mysql/data/llx_accounting_account_bf.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_bf.sql
@ -13,17 +13,15 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
--

 --
 -- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
 -- de l'install et tous les sigles '--' sont supprimés.
 --

--
-- Descriptif des plans comptables BF SYSCOHADA
-- ID 15000 - 16999
--
+-- Descriptif des plans comptables SYSCOHADA BF
+-- ID 15000-16999
+-- ADD 6000000 to rowid # Do no remove this comment --

 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (15000,'SYSCOHADA-BF','CAPIT','XXXXXX','1',            0,'Capital','1');
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (15001,'SYSCOHADA-BF','CAPIT','XXXXXX','101',      15000,'Capital social','1');
--- a/htdocs/install/mysql/data/llx_accounting_account_bj.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_bj.sql
@ -20,10 +20,9 @@
 -- de l'install et tous les sigles '--' sont supprimés.
 --

--
-- Descriptif des plans comptables BF SYSCOHADA
+-- Descriptif des plans comptables SYSCOHADA BJ
 -- ID 15000 - 16999
--
+-- ADD 4900000 to rowid # Do no remove this comment --

 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (15000,'SYSCOHADA-BJ','CAPIT','XXXXXX','1',            0,'Capital','1');
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (15001,'SYSCOHADA-BJ','CAPIT','XXXXXX','101',      15000,'Capital social','1');
--- a/htdocs/install/mysql/data/llx_accounting_account_cd.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_cd.sql
@ -13,17 +13,15 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
--

 --
 -- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
 -- de l'install et tous les sigles '--' sont supprimés.
 --

--
-- Descriptif des plans comptables BF SYSCOHADA
+-- Descriptif des plans comptables SYSCOHADA CD
 -- ID 15000 - 16999
--
+-- ADD 7300000 to rowid # Do no remove this comment --

 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (15000,'SYSCOHADA-CD','CAPIT','XXXXXX','1',            0,'Capital','1');
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (15001,'SYSCOHADA-CD','CAPIT','XXXXXX','101',      15000,'Capital social','1');
--- a/htdocs/install/mysql/data/llx_accounting_account_cf.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_cf.sql
@ -13,17 +13,15 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
--

 --
 -- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
 -- de l'install et tous les sigles '--' sont supprimés.
 --

--
-- Descriptif des plans comptables BF SYSCOHADA
+-- Descriptif des plans comptables SYSCOHADA CF
 -- ID 15000 - 16999
--
+-- ADD 6500000 to rowid # Do no remove this comment --

 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (15000,'SYSCOHADA-CF','CAPIT','XXXXXX','1',            0,'Capital','1');
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (15001,'SYSCOHADA-CF','CAPIT','XXXXXX','101',      15000,'Capital social','1');
--- a/htdocs/install/mysql/data/llx_accounting_account_cg.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_cg.sql
@ -13,17 +13,15 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
--

 --
 -- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
 -- de l'install et tous les sigles '--' sont supprimés.
 --

--
-- Descriptif des plans comptables BF SYSCOHADA
+-- Descriptif des plans comptables SYSCOHADA CG
 -- ID 15000 - 16999
--
+-- ADD 7200000 to rowid # Do no remove this comment --

 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (15000,'SYSCOHADA-CG','CAPIT','XXXXXX','1',            0,'Capital','1');
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (15001,'SYSCOHADA-CG','CAPIT','XXXXXX','101',      15000,'Capital social','1');
--- a/htdocs/install/mysql/data/llx_accounting_account_ch.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_ch.sql
@ -1,7 +1,8 @@
--
+
 -- Descriptif plan comptable Suisse
 -- ID 13000 - 13299
--
+-- ADD 600000 to rowid # Do no remove this comment --
+
 INSERT INTO llx_const (name, value, type, note, visible, entity) values ('ACCOUNTING_MANAGE_ZERO','1','chaine','Manage the  0 for the accountancy account',1,0);

 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (13000,'PCG_SUISSE','XXXXXX','XXXXXX','1',0,'Actifs','1');
--- a/htdocs/install/mysql/data/llx_accounting_account_ci.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_ci.sql
@ -13,17 +13,15 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
--

 --
 -- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
 -- de l'install et tous les sigles '--' sont supprimés.
 --

--
-- Descriptif des plans comptables BF SYSCOHADA
+-- Descriptif des plans comptables SYSCOHADA CI
 -- ID 15000 - 16999
--
+-- ADD 2100000 to rowid # Do no remove this comment --

 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (15000,'SYSCOHADA-CI','CAPIT','XXXXXX','1',            0,'Capital','1');
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (15001,'SYSCOHADA-CI','CAPIT','XXXXXX','101',      15000,'Capital social','1');
--- a/htdocs/install/mysql/data/llx_accounting_account_cl.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_cl.sql
@ -21,17 +21,15 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
--

 --
 -- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
 -- de l'install et tous les sigles '--' sont supprimés.
 --

--
 -- Descriptif des plans comptables CL PC-MIPYME
 -- ID 4785 - 4999
--
+-- ADD 6700000 to rowid # Do no remove this comment --

 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES(4785, 'PC-MIPYME', 'Activo', 'Circulante', '1.1', '0', 'Activo Circulante', 1);
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES(4786, 'PC-MIPYME', 'Activo', 'Circulante', '1.1.10.1', '4785', 'Caja', 1);
--- a/htdocs/install/mysql/data/llx_accounting_account_cm.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_cm.sql
@ -20,10 +20,9 @@
 -- de l'install et tous les sigles '--' sont supprimés.
 --

--
-- Descriptif des plans comptables BF SYSCOHADA-CM
+-- Descriptif des plans comptables SYSCOHADA-CM
 -- ID 15000 - 16999
--
+-- ADD 2400000 to rowid # Do no remove this comment --

 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (15000,'SYSCOHADA-CM','CAPIT','XXXXXX','1',            0,'Capital','1');
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (15001,'SYSCOHADA-CM','CAPIT','XXXXXX','101',      15000,'Capital social','1');
--- a/htdocs/install/mysql/data/llx_accounting_account_de.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_de.sql
--- a/htdocs/install/mysql/data/llx_accounting_account_dk.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_dk.sql
@ -20,16 +20,14 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
--

 --
 -- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
 -- de l'install et tous les sigles '--' sont supprimés.
 --

--
 -- Description of the accounts in DK-STD
--
+-- ADD 8000000 to rowid # Do no remove this comment --

 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (5082, 'DK-STD', 'Indtægter', '', '1000', '', 'Salg af varer/ydelser m. moms', 1);
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (5083, 'DK-STD', 'Indtægter', '', '1010', '', 'Salg af varer EU', 1);
--- a/htdocs/install/mysql/data/llx_accounting_account_es.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_es.sql
@ -27,10 +27,9 @@
 -- de l'install et tous les sigles '--' sont supprimés.
 --

--
 -- Descriptif des plans comptables ES PCG08-PYME
 -- ID 4000 - 4784
--
+-- ADD 400000 to rowid # Do no remove this comment --

 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4001,'PCG08-PYME','CAPIT', 'XXXXXX', '1', '0', 'Financiación básica', 1);
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4002,'PCG08-PYME','ACTIVO',  'XXXXXX', '2', '0', 'Activo no corriente', 1);
--- a/htdocs/install/mysql/data/llx_accounting_account_fr.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_fr.sql
@ -20,14 +20,15 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
--

 --
 -- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
 -- de l''install et tous les sigles '--' sont supprimés.
 --                                                         
-- ID    0 - 1999
-- ID 5000 - 5999
+
+-- ID    0 - 438
+-- ID 1501 - 5999
+-- ADD 100000 to rowid # Do no remove this comment --

 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1401,'PCG99-ABREGE','CAPIT',        'XXXXXX',   '1',    '0', 'Fonds propres, provisions pour risques et charges et dettes à plus d''un an', 1);
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1402,'PCG99-ABREGE','IMMO',         'XXXXXX',   '2',    '0', 'Frais d''établissement. Actifs immobilisés et créances à plus d''un an', 1);
@ -38,10 +39,10 @@ INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1407,'PCG99-ABREGE','INCOME',       'XXXXXX',   '7',    '0', 'Produits', 1);
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (   1,'PCG99-ABREGE','CAPIT', 'CAPITAL',       '101', '1401', 'Capital', 1);
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (   2,'PCG99-ABREGE','CAPIT', 'XXXXXX',        '105', '1401', 'Ecarts de réévaluation', 1);
-INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (   3,'PCG99-ABREGE','CAPIT', 'XXXXXX', '      1061', '1401', 'Réserve légale', 1);
-INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (   4,'PCG99-ABREGE','CAPIT', 'XXXXXX', '      1063', '1401', 'Réserves statutaires ou contractuelles', 1);
-INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (   5,'PCG99-ABREGE','CAPIT', 'XXXXXX', '      1064', '1401', 'Réserves réglementées', 1);
-INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (   6,'PCG99-ABREGE','CAPIT', 'XXXXXX', '      1068', '1401', 'Autres réserves', 1);
+INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (   3,'PCG99-ABREGE','CAPIT', 'XXXXXX',       '1061', '1401', 'Réserve légale', 1);
+INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (   4,'PCG99-ABREGE','CAPIT', 'XXXXXX',       '1063', '1401', 'Réserves statutaires ou contractuelles', 1);
+INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (   5,'PCG99-ABREGE','CAPIT', 'XXXXXX',       '1064', '1401', 'Réserves réglementées', 1);
+INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (   6,'PCG99-ABREGE','CAPIT', 'XXXXXX',       '1068', '1401', 'Autres réserves', 1);
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (   7,'PCG99-ABREGE','CAPIT', 'XXXXXX',        '108', '1401', 'Compte de l''exploitant', 1);
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (   8,'PCG99-ABREGE','CAPIT', 'XXXXXX',         '12', '1401', 'Résultat de l''exercice', 1);
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (   9,'PCG99-ABREGE','CAPIT', 'XXXXXX',        '145', '1401', 'Amortissements dérogatoires', 1);
@ -52,9 +53,9 @@ INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (  14,'PCG99-ABREGE','CAPIT', 'XXXXXX',         '16', '1401', 'Emprunts et dettes assimilees', 1);
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (  15,'PCG99-ABREGE', 'IMMO', 'XXXXXX',         '20', '1402', 'Immobilisations incorporelles', 1);
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (  16,'PCG99-ABREGE', 'IMMO', 'XXXXXX',        '201',   '15', 'Frais d''établissement', 1);
-INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (  17,'PCG99-ABREGE', 'IMMO', 'XXXXXX',        '206',	 '15', 'Droit au bail', 1);
-INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (  18,'PCG99-ABREGE', 'IMMO', 'XXXXXX',        '207',	 '15', 'Fonds commercial', 1);
-INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (  19,'PCG99-ABREGE', 'IMMO', 'XXXXXX',        '208',	 '15', 'Autres immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (  17,'PCG99-ABREGE', 'IMMO', 'XXXXXX',        '206',	'15', 'Droit au bail', 1);
+INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (  18,'PCG99-ABREGE', 'IMMO', 'XXXXXX',        '207',	'15', 'Fonds commercial', 1);
+INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (  19,'PCG99-ABREGE', 'IMMO', 'XXXXXX',        '208',	'15', 'Autres immobilisations incorporelles', 1);
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (  20,'PCG99-ABREGE', 'IMMO', 'XXXXXX',         '21', '1402', 'Immobilisations corporelles', 1);
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (  21,'PCG99-ABREGE', 'IMMO', 'XXXXXX',         '23', '1402', 'Immobilisations en cours', 1);
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (  22,'PCG99-ABREGE', 'IMMO', 'XXXXXX',         '27', '1402', 'Autres immobilisations financieres', 1);
@ -86,7 +87,7 @@ INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (  48,'PCG99-ABREGE','THIRDPARTY', 'XXXXXX',   '445', '1404', 'Etat - Taxes sur chiffre affaires', 1);
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (  49,'PCG99-ABREGE','THIRDPARTY', 'XXXXXX',   '447', '1404', 'Autres impôts, taxes et versements assimilés', 1);
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (  50,'PCG99-ABREGE','THIRDPARTY', 'XXXXXX',    '45', '1404', 'Groupe et associes', 1);
-INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (  51,'PCG99-ABREGE','THIRDPARTY', 'XXXXXX',   '455',	 '50', 'Associés', 1);
+INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (  51,'PCG99-ABREGE','THIRDPARTY', 'XXXXXX',   '455',   '50', 'Associés', 1);
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (  52,'PCG99-ABREGE','THIRDPARTY', 'XXXXXX',    '46', '1404', 'Débiteurs divers et créditeurs divers', 1);
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (  53,'PCG99-ABREGE','THIRDPARTY', 'XXXXXX',    '47', '1404', 'Comptes transitoires ou d''attente', 1);
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (  54,'PCG99-ABREGE','THIRDPARTY', 'XXXXXX',   '481', '1404', 'Charges à répartir sur plusieurs exercices', 1);
--- a/htdocs/install/mysql/data/llx_accounting_account_ga.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_ga.sql
@ -13,17 +13,15 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
--

 --
 -- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
 -- de l'install et tous les sigles '--' sont supprimés.
 --

--
-- Descriptif des plans comptables BF SYSCOHADA
+-- Descriptif des plans comptables SYSCOHADA GA
 -- ID 15000 - 16999
--
+-- ADD 1600000 to rowid # Do no remove this comment --

 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (15000,'SYSCOHADA-GA','CAPIT','XXXXXX','1',            0,'Capital','1');
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (15001,'SYSCOHADA-GA','CAPIT','XXXXXX','101',      15000,'Capital social','1');
--- a/htdocs/install/mysql/data/llx_accounting_account_gb.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_gb.sql
@ -13,17 +13,15 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
--

 --
 -- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
 -- de l'install et tous les sigles '--' sont supprimés.
 --

--
 -- Descriptif des plans comptables UK ENG-BASE 
 -- ID 70000 - 79999
--
+-- ADD 700000 to rowid # Do no remove this comment --

 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (71501, 'ENG-BASE', 'CAPIT',  'XXXXXX', '1', '0', 'Equity, provisions for liabilities and charges and liabilities at more than one year', 1);
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (71502, 'ENG-BASE', 'IMMO',   'XXXXXX', '2', '0', 'Administration fees.Fixed assets and receivables over one year', 1);
--- a/htdocs/install/mysql/data/llx_accounting_account_gq.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_gq.sql
@ -13,17 +13,15 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
--

 --
 -- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
 -- de l'install et tous les sigles '--' sont supprimés.
 --

--
-- Descriptif des plans comptables BF SYSCOHADA
+-- Descriptif des plans comptables SYSCOHADA GQ
 -- ID 15000 - 16999
--
+-- ADD 8700000 to rowid # Do no remove this comment --

 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (15000,'SYSCOHADA-GQ','CAPIT','XXXXXX','1',            0,'Capital','1');
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (15001,'SYSCOHADA-GQ','CAPIT','XXXXXX','101',      15000,'Capital social','1');
--- a/htdocs/install/mysql/data/llx_accounting_account_km.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_km.sql
@ -13,17 +13,15 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
--

 --
 -- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
 -- de l'install et tous les sigles '--' sont supprimés.
 --

--
-- Descriptif des plans comptables BF SYSCOHADA
+-- Descriptif des plans comptables SYSCOHADA KM
 -- ID 15000 - 16999
--
+-- ADD 7100000 to rowid # Do no remove this comment --

 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (15000,'SYSCOHADA-KM','CAPIT','XXXXXX','1',            0,'Capital','1');
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (15001,'SYSCOHADA-KM','CAPIT','XXXXXX','101',      15000,'Capital social','1');
--- a/htdocs/install/mysql/data/llx_accounting_account_lu.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_lu.sql
@ -1,7 +1,8 @@
--
+
 -- Descriptif plan comptable LU PCN
 -- ID 11000 - 12999
--
+-- ADD 14000000 to rowid # Do no remove this comment --
+
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (11000,'PCN-LUXEMBURG','CAPIT','XXXXXX','1','','Capital ou dotation des succursales et comptes de l''exploitant','1');
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (11001,'PCN-LUXEMBURG','CAPIT','XXXXXX','101',11000,'Capital souscrit (Sociétés de capitaux - Montant total)','1');
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (11002,'PCN-LUXEMBURG','CAPIT','XXXXXX','102',11000,'Capital souscrit non appelé (Sociétés de capitaux)','1');
--- a/htdocs/install/mysql/data/llx_accounting_account_ma.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_ma.sql
@ -1,7 +1,8 @@
--
+
 -- Descriptif plan comptable fr_MA PCG
 -- ID 7000 - 7999
--
+-- ADD 1200000 to rowid # Do no remove this comment --
+
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (7000,'PCG','CAPIT','XXXXXX','1','','Comptes de Financement Permanent','1');
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (7001,'PCG','CAPIT','XXXXXX','11',7000,'Capitaux Propres','1');
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (7002,'PCG','CAPIT','XXXXXX','1111',7001,'Capital Social','1');
--- a/htdocs/install/mysql/data/llx_accounting_account_ml.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_ml.sql
@ -13,17 +13,15 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
--

 --
 -- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
 -- de l'install et tous les sigles '--' sont supprimés.
 --

--
-- Descriptif des plans comptables BF SYSCOHADA
+-- Descriptif des plans comptables SYSCOHADA ML
 -- ID 15000 - 16999
--
+-- ADD 14700000 to rowid # Do no remove this comment --

 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (15000,'SYSCOHADA-ML','CAPIT','XXXXXX','1',            0,'Capital','1');
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (15001,'SYSCOHADA-ML','CAPIT','XXXXXX','101',      15000,'Capital social','1');
--- a/htdocs/install/mysql/data/llx_accounting_account_ne.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_ne.sql
@ -13,17 +13,15 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
--

 --
 -- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
 -- de l'install et tous les sigles '--' sont supprimés.
 --

--
-- Descriptif des plans comptables BF SYSCOHADA
+-- Descriptif des plans comptables SYSCOHADA NE
 -- ID 15000 - 16999
--
+-- ADD 16800000 to rowid # Do no remove this comment --

 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (15000,'SYSCOHADA-NE','CAPIT','XXXXXX','1',            0,'Capital','1');
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (15001,'SYSCOHADA-NE','CAPIT','XXXXXX','101',      15000,'Capital social','1');
--- a/htdocs/install/mysql/data/llx_accounting_account_ro.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_ro.sql
@ -13,14 +13,13 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
--

 --
 -- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
 -- de l''install et tous les sigles '--' sont supprimés.
 --                                                         

-- Created 20180518
+-- ADD 18800000 before rowid # Do no remove this comment --

 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1,'RO-BASE','CAPIT','XXXXXX','1','0','Conturi de capitaluri, provizioane, împrumuturi şi datorii asimilate',1);
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (10,'RO-BASE','CAPIT','XXXXXX','10','1','Capital şi rezerve',1);
--- a/htdocs/install/mysql/data/llx_accounting_account_sn.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_sn.sql
@ -13,17 +13,15 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
--

 --
 -- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
 -- de l'install et tous les sigles '--' sont supprimés.
 --

--
 -- Descriptif des plans comptables BF SYSCOHADA
 -- ID 15000 - 16999
--
+-- ADD 2200000 to rowid # Do no remove this comment --

 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (15000,'SYSCOHADA-SN','CAPIT','XXXXXX','1',            0,'Capital','1');
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (15001,'SYSCOHADA-SN','CAPIT','XXXXXX','101',      15000,'Capital social','1');
--- a/htdocs/install/mysql/data/llx_accounting_account_td.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_td.sql
@ -13,17 +13,15 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
--

 --
 -- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
 -- de l'install et tous les sigles '--' sont supprimés.
 --

--
-- Descriptif des plans comptables BF SYSCOHADA
+-- Descriptif des plans comptables SYSCOHADA TD
 -- ID 15000 - 16999
--
+-- ADD 6600000 to rowid # Do no remove this comment --

 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (15000,'SYSCOHADA-TD','CAPIT','XXXXXX','1',            0,'Capital','1');
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (15001,'SYSCOHADA-TD','CAPIT','XXXXXX','101',      15000,'Capital social','1');
--- a/htdocs/install/mysql/data/llx_accounting_account_tg.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_tg.sql
@ -13,17 +13,15 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
--

 --
 -- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
 -- de l'install et tous les sigles '--' sont supprimés.
 --

--
 -- Descriptif des plans comptables BF SYSCOHADA
 -- ID 15000 - 16999
--
+-- ADD 1500000 to rowid # Do no remove this comment --

 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (15000,'SYSCOHADA-TG','CAPIT','XXXXXX','1',            0,'Capital','1');
 INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (15001,'SYSCOHADA-TG','CAPIT','XXXXXX','101',      15000,'Capital social','1');
--- a/htdocs/install/mysql/data/llx_accounting_account_tn.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_tn.sql
@ -1,7 +1,7 @@
--
+
 -- Descriptif plan comptable TN PCT
 -- ID 9000 - 9999
--
+-- ADD 1000000 to rowid # Do no remove this comment --

 INSERT INTO llx_accounting_account(rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (9000,'PCT','CAPIT','XXXXXX','1','','Comptes de Financement Permanent','1');
 INSERT INTO llx_accounting_account(rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (9001,'PCT','CAPIT','XXXXXX','10',9000,'Capital','1');
--- a/htdocs/public/cron/cron_run_jobs.php
+++ b/htdocs/public/cron/cron_run_jobs.php
@ -103,15 +103,14 @@ if (! empty($id))
 		dol_syslog("cron_run_jobs.php Bad value for parameter job id", LOG_WARNING);
 		exit;
 	}
-	$filter=array();
 	$filter['t.rowid']=$id;
 }

-$result = $object->fetch_all('DESC','t.rowid', 0, 0, 1, $filter, 0);
+$result = $object->fetch_all('ASC,ASC,ASC','t.priority,t.entity,t.rowid', 0, 0, 1, $filter, 0);
 if ($result<0)
 {
-	echo "Error: ".$cronjob->error;
-	dol_syslog("cron_run_jobs.php fetch Error".$cronjob->error, LOG_WARNING);
+	echo "Error: ".$object->error;
+	dol_syslog("cron_run_jobs.php fetch Error".$object->error, LOG_WARNING);
 	exit;
 }

--- a/scripts/cron/cron_run_jobs.php
+++ b/scripts/cron/cron_run_jobs.php
@ -143,6 +143,12 @@ $object = new Cronjob($db);

 $filter=array();
 if (! empty($id)) {
+	if (! is_numeric($id))
+	{
+		echo "Error: Bad value for parameter job id";
+		dol_syslog("cron_run_jobs.php Bad value for parameter job id", LOG_WARNING);
+		exit;
+	}
 	$filter['t.rowid']=$id;
 }

@ -162,7 +168,7 @@ foreach($object->lines as $val)
 	$qualifiedjobs[] = $val;
 }

-// TODO This sequence of code must be shared with code into public/cron/cron_run_jobs.php php page.
+// TODO Duplicate. This sequence of code must be shared with code into public/cron/cron_run_jobs.php php page.

 $nbofjobs=count($qualifiedjobs);
 $nbofjobslaunchedok=0;