From 91b7e810852d8f75b7b2fbec950a1decca363235 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 30 Sep 2019 21:51:42 +0200 Subject: [PATCH 1/7] Fix warnings --- htdocs/install/inc.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index c8dc7fd4382..bcca012eeac 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -544,12 +544,16 @@ function detect_dolibarr_main_url_root() $dolibarr_main_url_root = $_SERVER["SERVER_URL"] . $_SERVER["DOCUMENT_URI"]; } // If SCRIPT_URI, SERVER_URL, DOCUMENT_URI not defined (Ie: Apache 2.0.44 for Windows) else { - $proto = ( (!empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') || $_SERVER['SERVER_PORT'] == 443) ? 'https' : 'http'; + $proto = ((!empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') || (! empty($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] == 443)) ? 'https' : 'http'; if (!empty($_SERVER["HTTP_HOST"])) { $serverport = $_SERVER["HTTP_HOST"]; - } else { + } + elseif (!empty($_SERVER["SERVER_NAME"])) { $serverport = $_SERVER["SERVER_NAME"]; } + else { + $serverport = 'localhost'; + } $dolibarr_main_url_root = $proto . "://" . $serverport . $_SERVER["SCRIPT_NAME"]; } // Clean proposed URL From af3bee6fcf4db75f1b240da14ae00cd727164340 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 30 Sep 2019 21:59:42 +0200 Subject: [PATCH 2/7] Remove warning --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index de9e7e00947..50f8fb08a24 100644 --- a/.travis.yml +++ b/.travis.yml @@ -222,6 +222,7 @@ before_script: echo '$'dolibarr_main_db_host=\'127.0.0.1\'';' >> $CONF_FILE echo '$'dolibarr_main_db_name=\'travis\'';' >> $CONF_FILE echo '$'dolibarr_main_db_user=\'travis\'';' >> $CONF_FILE + echo '$'dolibarr_main_instance_unique_id=\'travis1234567890\'';' >> $CONF_FILE if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ]; then echo '$'dolibarr_main_db_type=\'mysqli\'';' >> $CONF_FILE echo '$'dolibarr_main_db_port=\'3306\'';' >> $CONF_FILE From edf1c74519d5ea3ac2142ad95abf58144c8f2cad Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 30 Sep 2019 22:04:32 +0200 Subject: [PATCH 3/7] Add log of errors --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 50f8fb08a24..aa1807133a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -335,6 +335,7 @@ script: php step2.php set >> $TRAVIS_BUILD_DIR/install.log if [ "$?" -ne "0" ]; then echo "SORRY, AN ERROR OCCURED DURING INSTALLATION PROCESS" + tail -n 100 $TRAVIS_BUILD_DIR/install.log exit 1 fi cd ../.. From ebc79cf5eafe900b49648d190b770b8319363fd8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 30 Sep 2019 22:13:21 +0200 Subject: [PATCH 4/7] Clean travis file --- .travis.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index aa1807133a1..9701edfc0a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -300,13 +300,9 @@ script: set +e echo -# TODO: Check Javascript (jshint?) - -# TODO: Check CSS (csslint?) - - | export INSTALL_FORCED_FILE=htdocs/install/install.forced.php - echo "Setting up Dolibarr $INSTALL_FORCED_FILE" + echo "Setting up Dolibarr $INSTALL_FORCED_FILE to test installation" # Ensure we catch errors set +e echo ' $INSTALL_FORCED_FILE @@ -327,9 +323,10 @@ script: echo '$'force_install_createuser=false';' >> $INSTALL_FORCED_FILE echo '$'force_install_mainforcehttps=false';' >> $INSTALL_FORCED_FILE echo '$'force_install_main_data_root=\'$TRAVIS_BUILD_DIR/htdocs\'';' >> $INSTALL_FORCED_FILE - # TODO: SQLite #cat $INSTALL_FORCED_FILE - echo "Installation test" + +- | + echo "Installing Dolibarr" cd htdocs/install php step1.php $TRAVIS_BUILD_DIR/htdocs > $TRAVIS_BUILD_DIR/install.log php step2.php set >> $TRAVIS_BUILD_DIR/install.log @@ -344,7 +341,7 @@ script: set +e echo - - | +- | echo "Setting up database to test migrations" if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ] || [ "$DB" = 'postgresql' ]; then echo "MySQL" @@ -359,7 +356,6 @@ script: #pgloader mysql://root:pass@127.0.0.1/base postgresql://dolibarrowner@127.0.0.1/dolibarr pgloader mysql://root@127.0.0.1/travis postgresql:///travis fi - # TODO: SQLite echo - | From 83ddf5ac8d6a0835ec1e3c4901c134b18c683316 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 30 Sep 2019 22:50:48 +0200 Subject: [PATCH 5/7] Disable test of pgsql installation --- .travis.yml | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9701edfc0a2..9b639c95bd8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -209,7 +209,6 @@ before_script: #echo 'select * from information_schema.table_constraints;' | psql travis #echo 'ALTER TABLE "llx_accounting_account" DROP CONSTRAINT "idx_16390_primary"' | psql travis fi - # TODO: SQLite echo - | @@ -325,22 +324,22 @@ script: echo '$'force_install_main_data_root=\'$TRAVIS_BUILD_DIR/htdocs\'';' >> $INSTALL_FORCED_FILE #cat $INSTALL_FORCED_FILE -- | - echo "Installing Dolibarr" - cd htdocs/install - php step1.php $TRAVIS_BUILD_DIR/htdocs > $TRAVIS_BUILD_DIR/install.log - php step2.php set >> $TRAVIS_BUILD_DIR/install.log - if [ "$?" -ne "0" ]; then - echo "SORRY, AN ERROR OCCURED DURING INSTALLATION PROCESS" - tail -n 100 $TRAVIS_BUILD_DIR/install.log - exit 1 - fi - cd ../.. - rm $INSTALL_FORCED_FILE - #cat $TRAVIS_BUILD_DIR/install.log - set +e - echo - +#- | +# echo "Installing Dolibarr" +# cd htdocs/install +# php step1.php $TRAVIS_BUILD_DIR/htdocs > $TRAVIS_BUILD_DIR/install.log +# php step2.php set >> $TRAVIS_BUILD_DIR/install.log +# if [ "$?" -ne "0" ]; then +# echo "SORRY, AN ERROR OCCURED DURING INSTALLATION PROCESS" +# cat $TRAVIS_BUILD_DIR/install.log +# exit 1 +# fi +# cd ../.. +# rm $INSTALL_FORCED_FILE +# #cat $TRAVIS_BUILD_DIR/install.log +# set +e +# echo + - | echo "Setting up database to test migrations" if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ] || [ "$DB" = 'postgresql' ]; then From bd76c1da115ae255c9b97b40d20633347f2e1c0b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 1 Oct 2019 01:35:11 +0200 Subject: [PATCH 6/7] Look and feel v10 --- htdocs/admin/facture.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index 765f2e6f995..e21dc942284 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -808,36 +808,39 @@ print ''; print '
'; print load_fiche_titre($langs->trans("PathToDocuments"), '', ''); -print ''."\n"; +print '
'; +print '
'."\n"; print ''."\n"; print ''."\n"; print ''."\n"; print "\n"; -print ''."\n"; +print ''."\n"; print ''."\n"; print ''."\n"; print ''."\n"; print "
'.$langs->trans("Name").''.$langs->trans("Value").'
'.$langs->trans("PathDirectory").''.$conf->facture->dir_output.'
\n"; - +print "\n"; /* * Notifications */ print '
'; print load_fiche_titre($langs->trans("Notifications"), '', ''); -print ''; + +print '
'; +print '
'; print ''; print ''; print ''; print ''; print "\n"; - print '\n"; - print '
'.$langs->trans("Parameter").' 
'; print $langs->trans("YouMayFindNotificationsFeaturesIntoModuleNotification").'
'; print '		'; print "
'; +print "\n"; + dol_fiche_end(); From 41bfc89544e456f3db6ecdef4f96f62f20862145 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 1 Oct 2019 01:42:08 +0200 Subject: [PATCH 7/7] Fix travis for pgsql --- .travis.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9b639c95bd8..d5583ef6ff2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -200,6 +200,7 @@ before_script: mysql -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql fi if [ "$DB" = 'postgresql' ]; then + #pgsql travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql #pgloader mysql://root:pass@127.0.0.1/dolibarr_9 postgresql://dolibarrowner:dolibarrownerpass@127.0.0.1/dolibarr_dev echo pgloader mysql://root@127.0.0.1/travis postgresql:///travis pgloader mysql://root@127.0.0.1/travis postgresql:///travis @@ -230,7 +231,6 @@ before_script: echo '$'dolibarr_main_db_type=\'pgsql\'';' >> $CONF_FILE echo '$'dolibarr_main_db_port=\'5432\'';' >> $CONF_FILE fi - # TODO: SQLite echo '$'dolibarr_main_authentication=\'dolibarr\'';' >> $CONF_FILE cat $CONF_FILE echo @@ -353,7 +353,13 @@ script: if [ "$DB" = 'postgresql' ]; then #pgsql travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql #pgloader mysql://root:pass@127.0.0.1/base postgresql://dolibarrowner@127.0.0.1/dolibarr + echo pgloader mysql://root@127.0.0.1/travis postgresql:///travis pgloader mysql://root@127.0.0.1/travis postgresql:///travis + echo 'ALTER SEQUENCE llx_accountingaccount_rowid_seq RENAME TO llx_accounting_account_rowid_seq' | psql travis + echo 'ALTER SEQUENCE llx_accounting_account_rowid_seq RESTART WITH 1000001;' | psql travis + #echo 'select * from INFORMATION_SCHEMA.COLUMNS where table_name = 'llx_accountingaccount' | psql travis + #echo 'select * from information_schema.table_constraints;' | psql travis + #echo 'ALTER TABLE "llx_accounting_account" DROP CONSTRAINT "idx_16390_primary"' | psql travis fi echo