[openaria-Commits] r2512 - in branches/1.6.0-develop_autocomplete-readonly: . app obj

[mbi...@adullact.net]

Author: mbideau
Date: 2019-03-14 16:36:09 +0100 (Thu, 14 Mar 2019)
New Revision: 2512

Added:
branches/1.6.0-develop_autocomplete-readonly/app/php/
Modified:
branches/1.6.0-develop_autocomplete-readonly/
branches/1.6.0-develop_autocomplete-readonly/obj/openaria.class.php
Log:
Rebase de la branche d'int?\195?\169gration '1.6.0-develop' vers la branche de d?\195?\169veloppement '1.6.0-develop_autocomplete-readonly'

Index: branches/1.6.0-develop_autocomplete-readonly
===================================================================
--- branches/1.6.0-develop_autocomplete-readonly 2019-03-14 15:34:52 UTC (rev 2511)
+++ branches/1.6.0-develop_autocomplete-readonly 2019-03-14 15:36:09 UTC (rev 2512)

Property changes on: branches/1.6.0-develop_autocomplete-readonly
___________________________________________________________________
Modified: svn:mergeinfo
## -2,6 +2,7 ##
/branches/1.4.0-develop-fmwk-4.8:2274-2298
/branches/1.4.0-develop-typesecondaire:2248-2271
/branches/1.5.0-develop:2368-2409
+/branches/1.6.0-develop:2504-2511
/branches/bug_identifiant_sig_voie:2160-2166
/branches/bug_test_annee:2034-2039
/branches/contraintes_merge_fields:1801-1822
## -26,4 +27,4 ##
/branches/trunk_bug_dc_contacts:2165-2171
/branches/trunk_evo_OM_4.6:2168-2201
/branches/trunk_sur_fmwk_4.9.0:2345-2368
-/trunk:2496,2499-2500
\ No newline at end of property
+/trunk:2496,2499-2500,2507
\ No newline at end of property
Modified: branches/1.6.0-develop_autocomplete-readonly/obj/openaria.class.php
===================================================================
--- branches/1.6.0-develop_autocomplete-readonly/obj/openaria.class.php 2019-03-14 15:34:52 UTC (rev 2511)
+++ branches/1.6.0-develop_autocomplete-readonly/obj/openaria.class.php 2019-03-14 15:36:09 UTC (rev 2512)
@@ -34,8 +34,8 @@
get_include_path().PATH_SEPARATOR.implode(
PATH_SEPARATOR,
array(
- getcwd()."/../php/pear",
- getcwd()."/../php/db",
+ getcwd()."/../app/php/pear",
+ getcwd()."/../app/php/db",
getcwd()."/../php/fpdf",
getcwd()."/../php/phpmailer",
getcwd()."/../php/tcpdf",