diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php index e77ac90cfcf..0e1aa99cf77 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.php @@ -365,9 +365,9 @@ function dol_time_plus_duree($time,$duration_value,$duration_unit) /* For backward compatibility */ -function dolibarr_print_date($time,$format='',$to_gmt=false,$outputlangs='') +function dolibarr_print_date($time,$format='',$to_gmt=false,$outputlangs='',$encodetooutput=false) { - return dol_print_date($time,$format,$to_gmt,$outputlangs); + return dol_print_date($time,$format,$to_gmt,$outputlangs,$encodetooutput); } /** diff --git a/mysql/data/data.sql b/mysql/data/data.sql index 824308b2bcc..5a892258cb0 100644 --- a/mysql/data/data.sql +++ b/mysql/data/data.sql @@ -662,6 +662,7 @@ insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'27','Paroi insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'29','Autre groupement de droit privé non doté de la personnalité morale'); insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'31','Personne morale de droit étranger, immatriculée au RCS'); insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'32','Personne morale de droit étranger, non immatriculée au RCS'); +insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'35','Régime auto-entrepreneur'); insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'41','Établissement public ou régie à caractère industriel ou commercial'); diff --git a/mysql/migration/2.5.0-2.6.0.sql b/mysql/migration/2.5.0-2.6.0.sql index 262aef5f81a..62c448853d7 100644 --- a/mysql/migration/2.5.0-2.6.0.sql +++ b/mysql/migration/2.5.0-2.6.0.sql @@ -56,6 +56,9 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (19 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2461,246, '0','0','VAT Rate 0',1); +insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'35','Régime auto-entrepreneur'); + + alter table llx_user_param drop column page; alter table llx_commande_fournisseur_log add column comment varchar(255) NULL;