From 3574146baa903c5ffe828412e0fad586a8819bdf Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Thu, 24 Oct 2013 14:36:02 +0200 Subject: [PATCH 1/4] commit --- 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 6d415001364d149255f2c6524211dd2830ef3c31 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Fri, 8 Nov 2013 10:08:01 +0100 Subject: [PATCH 2/4] Fix : SQL error on margin page --- htdocs/margin/productMargins.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php index 50d30a217f0..f16cb126e87 100644 --- a/htdocs/margin/productMargins.php +++ b/htdocs/margin/productMargins.php @@ -158,7 +158,7 @@ print ''; $sql = "SELECT p.label, p.rowid, p.fk_product_type, p.ref,"; $sql.= " d.fk_product,"; $sql.= " f.rowid as facid, f.facnumber, f.total as total_ht,"; -$sql.= " f.datef, f.paye, f.fk_statut as statut"; +$sql.= " f.datef, f.paye, f.fk_statut as statut,"; $sql.= " sum(d.total_ht) as selling_price,"; $sql.= " sum(".$db->ifsql('d.total_ht <=0','d.qty * d.buy_price_ht * -1','d.qty * d.buy_price_ht').") as buying_price,"; $sql.= " sum(".$db->ifsql('d.total_ht <=0','-1 * (abs(d.total_ht) - (d.buy_price_ht * d.qty))','d.total_ht - (d.buy_price_ht * d.qty)').") as marge"; From 1c6edf2d033e17bb407b75c8af3b8f9c2b10386b Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Fri, 8 Nov 2013 14:07:11 +0100 Subject: [PATCH 3/4] Fix : error in replenish SQL --- htdocs/product/stock/replenish.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php index a5754cf10b4..788bd8fee09 100644 --- a/htdocs/product/stock/replenish.php +++ b/htdocs/product/stock/replenish.php @@ -215,7 +215,7 @@ $sql.= ' GROUP BY p.rowid, p.ref, p.label, p.price'; $sql.= ', p.price_ttc, p.price_base_type,p.fk_product_type, p.tms'; $sql.= ', p.duration, p.tobuy, p.seuil_stock_alerte'; $sql.= ', p.desiredstock, s.fk_product'; -$sql.= ' HAVING p.desiredstock > SUM('.$db->ifsql("s.reel IS NULL", "s.reel", "0").')'; +$sql.= ' HAVING p.desiredstock > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')'; $sql.= ' AND p.desiredstock > 0'; if ($salert == 'on') // Option to see when stock is lower than alert { From 2b74f03eb628ffe37b006873c6bc1100e6cc5094 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Fri, 8 Nov 2013 16:24:03 +0100 Subject: [PATCH 4/4] Fix : column name changed --- htdocs/public/members/public_list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php index 968b1a30065..d186467ee04 100644 --- a/htdocs/public/members/public_list.php +++ b/htdocs/public/members/public_list.php @@ -92,7 +92,7 @@ $filter=GETPOST('filter'); $statut=GETPOST('statut'); if (! $sortorder) { $sortorder="ASC"; } -if (! $sortfield) { $sortfield="nom"; } +if (! $sortfield) { $sortfield="lastname"; } /*