From d6da87138150d5f477ff3be014d810109926348e Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Thu, 10 Oct 2013 09:31:37 +0200 Subject: [PATCH 1/4] Add object declaration on paiment --- htdocs/compta/paiement.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 6faeb1fa951..b75c952b1f6 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -57,6 +57,14 @@ if ($user->societe_id > 0) $socid = $user->societe_id; } +$object=new Facture($db); + +// Load object +if ($facid > 0) +{ + $ret=$object->fetch($id); +} + // Initialize technical object to manage hooks of paiements. Note that conf->hooks_modules contains array array $hookmanager = new HookManager($db); $hookmanager->initHooks(array('paiementcard')); From 695cef55d9a7f8ed7d731975bd46afd2f8c15951 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Thu, 10 Oct 2013 09:31:47 +0200 Subject: [PATCH 2/4] Rem duplicate code --- htdocs/expedition/fiche.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index c586329d4c9..f869bb24715 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -70,11 +70,6 @@ $hidedesc = (GETPOST('hidedesc','int') ? GETPOST('hidedesc','int') : (! empty( $hideref = (GETPOST('hideref','int') ? GETPOST('hideref','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0)); $object = new Expedition($db); -// Load object -if ($id > 0 || ! empty($ref)) -{ - $ret=$object->fetch($id, $ref); -} // Load object if ($id > 0 || ! empty($ref)) @@ -95,8 +90,6 @@ if ($action == 'add') { $error=0; - $object = new Expedition($db); - $db->begin(); $object->note = GETPOST('note','alpha'); From ae17ec18912a9bba35e7c08b4b77c6492d90dfa7 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Mon, 14 Oct 2013 09:42:00 +0200 Subject: [PATCH 3/4] Commit soap UI (not modified) --- test/soapui/Dolibarr-soapui-project.xml | 514 ++++++++++++------------ 1 file changed, 257 insertions(+), 257 deletions(-) diff --git a/test/soapui/Dolibarr-soapui-project.xml b/test/soapui/Dolibarr-soapui-project.xml index a5cb4d96a99..e880ef1f5ad 100755 --- a/test/soapui/Dolibarr-soapui-project.xml +++ b/test/soapui/Dolibarr-soapui-project.xml @@ -1,4 +1,4 @@ - + http://localhostdolibarr/dolibarrnew/webservices/server_other.php?wsdl @@ -757,211 +757,211 @@ all -]]>http://localhost/dolibarr/htdocs/webservices/server_productorservice.php?wsdl - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - WS to get product or service - - - - - WS to create a product or service - - - - - WS to update a product or service - - - - - WS to get list of all products or services id and ref - - - - - WS to get list of all products or services for a category - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +]]>http://localhost/dolibarr/htdocs/webservices/server_productorservice.php?wsdl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + WS to get product or service + + + + + WS to create a product or service + + + + + WS to update a product or service + + + + + WS to get list of all products or services id and ref + + + + + WS to get list of all products or services for a category + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]>http://schemas.xmlsoap.org/wsdl/http://localhost/dolibarr/htdocs/webservices/server_productorservice.phphttp://localhostdolibarr/dolibarrnew/webservices/server_productorservice.phphttp://localhost/dolibarr/htdocs/webservices/server_productorservice.php<xml-fragment/>UTF-8http://localhost/dolibarr/htdocs/webservices/server_productorservice.php @@ -1127,57 +1127,57 @@ 5 -]]><xml-fragment/>UTF-8http://localhost/dolibarr/htdocs/webservices/server_productorservice.php - - - - - - dolibarrkey - aaa - admin - admin - - - - - 1 - - 111 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +]]><xml-fragment/>UTF-8http://localhost/dolibarr/htdocs/webservices/server_productorservice.php + + + + + + dolibarrkey + aaa + admin + admin + + + + + 1 + + 111 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]>http://localhostdolibarr/webservices/server_user.php?wsdl From 0994184bf94d48036aec1c6ae537efd7474a88f5 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Mon, 14 Oct 2013 09:45:32 +0200 Subject: [PATCH 4/4] Fix invoice fetch on payment page --- htdocs/compta/paiement.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index b75c952b1f6..3b9d257314e 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -62,7 +62,7 @@ $object=new Facture($db); // Load object if ($facid > 0) { - $ret=$object->fetch($id); + $ret=$object->fetch($facid); } // Initialize technical object to manage hooks of paiements. Note that conf->hooks_modules contains array array