From eca37eb1235e5e4de037c2783151456aa1a30694 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 23 Aug 2012 17:24:29 +0200 Subject: [PATCH 1/3] Fix: [ bug #497 ] Module Order Supplier inaccessible altogether because of a missing SQL field --- htdocs/install/mysql/migration/3.2.0-3.3.0.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql index 57f61c19bdd..2fc0d9d0771 100755 --- a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql +++ b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql @@ -73,3 +73,5 @@ INSERT INTO llx_const (name, value, type, note, visible) values ('PRODUCT_CODEPR ALTER TABLE llx_c_barcode_type ADD UNIQUE INDEX uk_c_barcode_type(code, entity); ALTER TABLE llx_socpeople ADD column no_email SMALLINT NOT NULL DEFAULT 0 AFTER priv; + +ALTER TABLE llx_commande_fournisseur ADD COLUMN date_livraison date NULL; From 56a22d2b594f4e39ed1d2551bf2e24426bf1c9ce Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 23 Aug 2012 18:15:54 +0200 Subject: [PATCH 2/3] Fix: rename for security raison --- ...o_wsclient_invoice.php => demo_wsclient_invoice.php-NORUN} | 4 ++-- ...{demo_wsclient_other.php => demo_wsclient_other.php-NORUN} | 4 ++-- ...orservice.php => demo_wsclient_productorservice.php-NORUN} | 4 ++-- ...ient_thirdparty.php => demo_wsclient_thirdparty.php-NORUN} | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) rename htdocs/webservices/{demo_wsclient_invoice.php => demo_wsclient_invoice.php-NORUN} (97%) rename htdocs/webservices/{demo_wsclient_other.php => demo_wsclient_other.php-NORUN} (96%) rename htdocs/webservices/{demo_wsclient_productorservice.php => demo_wsclient_productorservice.php-NORUN} (98%) rename htdocs/webservices/{demo_wsclient_thirdparty.php => demo_wsclient_thirdparty.php-NORUN} (96%) diff --git a/htdocs/webservices/demo_wsclient_invoice.php b/htdocs/webservices/demo_wsclient_invoice.php-NORUN similarity index 97% rename from htdocs/webservices/demo_wsclient_invoice.php rename to htdocs/webservices/demo_wsclient_invoice.php-NORUN index e0287870666..17c76af2081 100755 --- a/htdocs/webservices/demo_wsclient_invoice.php +++ b/htdocs/webservices/demo_wsclient_invoice.php-NORUN @@ -23,8 +23,8 @@ // This is to make Dolibarr working with Plesk set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); -require_once '../master.inc.php'; -require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP +require_once("../master.inc.php"); +require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_invoice.php'; //$WS_DOL_URL = 'http://localhost:8080/'; // To test with Soapui mock. If not a page, should end with / diff --git a/htdocs/webservices/demo_wsclient_other.php b/htdocs/webservices/demo_wsclient_other.php-NORUN similarity index 96% rename from htdocs/webservices/demo_wsclient_other.php rename to htdocs/webservices/demo_wsclient_other.php-NORUN index 21ef7d966e7..713d6741972 100755 --- a/htdocs/webservices/demo_wsclient_other.php +++ b/htdocs/webservices/demo_wsclient_other.php-NORUN @@ -23,8 +23,8 @@ // This is to make Dolibarr working with Plesk set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); -require_once '../master.inc.php'; -require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP +require_once("../master.inc.php"); +require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_other.php'; //$WS_DOL_URL = 'http://localhost:8080/'; // If not a page, should end with / diff --git a/htdocs/webservices/demo_wsclient_productorservice.php b/htdocs/webservices/demo_wsclient_productorservice.php-NORUN similarity index 98% rename from htdocs/webservices/demo_wsclient_productorservice.php rename to htdocs/webservices/demo_wsclient_productorservice.php-NORUN index aa0f1a31ea5..0bbd0f00393 100755 --- a/htdocs/webservices/demo_wsclient_productorservice.php +++ b/htdocs/webservices/demo_wsclient_productorservice.php-NORUN @@ -23,8 +23,8 @@ // This is to make Dolibarr working with Plesk set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); -require_once '../master.inc.php'; -require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP +require_once("../master.inc.php"); +require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_productorservice.php'; //$WS_DOL_URL = 'http://localhost:8080/'; // To test with Soapui mock. If not a page, should end with / diff --git a/htdocs/webservices/demo_wsclient_thirdparty.php b/htdocs/webservices/demo_wsclient_thirdparty.php-NORUN similarity index 96% rename from htdocs/webservices/demo_wsclient_thirdparty.php rename to htdocs/webservices/demo_wsclient_thirdparty.php-NORUN index 519d417edb3..96f78df4d1d 100755 --- a/htdocs/webservices/demo_wsclient_thirdparty.php +++ b/htdocs/webservices/demo_wsclient_thirdparty.php-NORUN @@ -23,8 +23,8 @@ // This is to make Dolibarr working with Plesk set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); -require_once '../master.inc.php'; -require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP +require_once("../master.inc.php"); +require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_thirdparty.php'; //$WS_DOL_URL = 'http://localhost:8080/'; // If not a page, should end with / From ead2a81baf84f4a1502157e40904f2e7a9047a1f Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 23 Aug 2012 18:45:41 +0200 Subject: [PATCH 3/3] Fix: merge problem --- htdocs/webservices/demo_wsclient_invoice.php-NORUN | 4 ++-- htdocs/webservices/demo_wsclient_other.php-NORUN | 4 ++-- htdocs/webservices/demo_wsclient_productorservice.php-NORUN | 4 ++-- htdocs/webservices/demo_wsclient_thirdparty.php-NORUN | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/webservices/demo_wsclient_invoice.php-NORUN b/htdocs/webservices/demo_wsclient_invoice.php-NORUN index 17c76af2081..e0287870666 100755 --- a/htdocs/webservices/demo_wsclient_invoice.php-NORUN +++ b/htdocs/webservices/demo_wsclient_invoice.php-NORUN @@ -23,8 +23,8 @@ // This is to make Dolibarr working with Plesk set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); -require_once("../master.inc.php"); -require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP +require_once '../master.inc.php'; +require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_invoice.php'; //$WS_DOL_URL = 'http://localhost:8080/'; // To test with Soapui mock. If not a page, should end with / diff --git a/htdocs/webservices/demo_wsclient_other.php-NORUN b/htdocs/webservices/demo_wsclient_other.php-NORUN index 713d6741972..21ef7d966e7 100755 --- a/htdocs/webservices/demo_wsclient_other.php-NORUN +++ b/htdocs/webservices/demo_wsclient_other.php-NORUN @@ -23,8 +23,8 @@ // This is to make Dolibarr working with Plesk set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); -require_once("../master.inc.php"); -require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP +require_once '../master.inc.php'; +require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_other.php'; //$WS_DOL_URL = 'http://localhost:8080/'; // If not a page, should end with / diff --git a/htdocs/webservices/demo_wsclient_productorservice.php-NORUN b/htdocs/webservices/demo_wsclient_productorservice.php-NORUN index 0bbd0f00393..aa0f1a31ea5 100755 --- a/htdocs/webservices/demo_wsclient_productorservice.php-NORUN +++ b/htdocs/webservices/demo_wsclient_productorservice.php-NORUN @@ -23,8 +23,8 @@ // This is to make Dolibarr working with Plesk set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); -require_once("../master.inc.php"); -require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP +require_once '../master.inc.php'; +require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_productorservice.php'; //$WS_DOL_URL = 'http://localhost:8080/'; // To test with Soapui mock. If not a page, should end with / diff --git a/htdocs/webservices/demo_wsclient_thirdparty.php-NORUN b/htdocs/webservices/demo_wsclient_thirdparty.php-NORUN index 96f78df4d1d..519d417edb3 100755 --- a/htdocs/webservices/demo_wsclient_thirdparty.php-NORUN +++ b/htdocs/webservices/demo_wsclient_thirdparty.php-NORUN @@ -23,8 +23,8 @@ // This is to make Dolibarr working with Plesk set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); -require_once("../master.inc.php"); -require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP +require_once '../master.inc.php'; +require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_thirdparty.php'; //$WS_DOL_URL = 'http://localhost:8080/'; // If not a page, should end with /