Merge pull request #1928 from FHenry/3.6_fixwebservice

3.6 fixwebservice

ChangeLog

@@ -21,6 +21,7 @@ For users:
 - Fix: cents for indian ruppes are calle paisa and paise.
 - Fix: Invoices payments may be older than invoices.
 - Fix: [ bug #1593 ] Spanish Localtax IRPF not being calculated since 3.6.0 in supplier invoices when adding a line
+- Fix: Web service categorie WDSL declaration is correct
 
 ***** ChangeLog for 3.6 compared to 3.5.* *****
 For users:

htdocs/fourn/fiche.php

@@ -48,6 +48,12 @@ $result = restrictedArea($user, 'societe&fournisseur', $id, '&societe');
 
 $object = new Fournisseur($db);
 
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('suppliercard'));
+
+$parameters = array('id' => $id);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+
 /*
  * Action
  */
@@ -435,34 +441,41 @@ if ($object->fetch($id))
 	 * Barre d'actions
 	 */
 
+	
 	print '<div class="tabsAction">';
 	
-	if ($user->rights->fournisseur->commande->creer)
+	$parameters = array();
-	{
+	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
-		$langs->load("orders");
+		// modified by hook
-		print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/fiche.php?action=create&socid='.$object->id.'">'.$langs->trans("AddOrder").'</a>';
+		if (empty($reshook)) {
+	
+		if ($user->rights->fournisseur->commande->creer)
+		{
+			$langs->load("orders");
+			print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/fiche.php?action=create&socid='.$object->id.'">'.$langs->trans("AddOrder").'</a>';
+		}
+	
+		if ($user->rights->fournisseur->facture->creer)
+		{
+			$langs->load("bills");
+			print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/fiche.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a>';
+		}
+	
+	    // Add action
+	    if (! empty($conf->agenda->enabled) && ! empty($conf->global->MAIN_REPEATTASKONEACHTAB))
+	    {
+	        if ($user->rights->agenda->myactions->create)
+	        {
+	            print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&socid='.$object->id.'">'.$langs->trans("AddAction").'</a>';
+	        }
+	        else
+	        {
+	            print '<a class="butAction" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddAction").'</a>';
+	        }
+	    }
+	
+		print '</div>';
 	}
-
-	if ($user->rights->fournisseur->facture->creer)
-	{
-		$langs->load("bills");
-		print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/fiche.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a>';
-	}
-
-    // Add action
-    if (! empty($conf->agenda->enabled) && ! empty($conf->global->MAIN_REPEATTASKONEACHTAB))
-    {
-        if ($user->rights->agenda->myactions->create)
-        {
-            print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&socid='.$object->id.'">'.$langs->trans("AddAction").'</a>';
-        }
-        else
-        {
-            print '<a class="butAction" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddAction").'</a>';
-        }
-    }
-
-	print '</div>';
 	print '<br>';
 
     if (! empty($conf->global->MAIN_REPEATCONTACTONEACHTAB))

htdocs/product/class/product.class.php

@@ -1413,6 +1413,7 @@ class Product extends CommonObject
 		$sql.= " weight, weight_units, length, length_units, surface, surface_units, volume, volume_units, barcode, fk_barcode_type, finished,";
 		$sql.= " accountancy_code_buy, accountancy_code_sell, stock, pmp,";
 		$sql.= " datec, tms, import_key, entity, desiredstock, tobatch";
+		$sql.= " ,ref_ext";
 		$sql.= " FROM ".MAIN_DB_PREFIX."product";
 		if ($id) $sql.= " WHERE rowid = ".$this->db->escape($id);
 		else
@@ -1488,6 +1489,8 @@ class Product extends CommonObject
 				$this->import_key				= $obj->import_key;
 				$this->entity					= $obj->entity;
 				
+				$this->ref_ext					= $obj->ref_ext;
+
 				$this->db->free($resql);
 
 

htdocs/webservices/server_category.php

@@ -106,56 +106,41 @@ $server->wsdl->addComplexType(
     'tns:categorie'
 );
 
-/*
+ /*
- * Tableau des catégories
+  * Image of product
-
-$server->wsdl->addComplexType(
-    'categories',
-    'complexType',
-    'array',
-    '',
-    'SOAP-ENC:Array',
-    array(),
-    array(
-        array('id'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'tns:categorie[]')
-    ),
-    'tns:categories'
-);
  */
+ $server->wsdl->addComplexType(
+ 		'PhotosArray',
+ 		'complexType',
+ 		'array',
+ 		'sequence',
+ 		'',
+ 		array(
+ 				'image' => array(
+ 						'name' => 'image',
+ 						'type' => 'tns:image',
+ 						'minOccurs' => '0',
+ 						'maxOccurs' => 'unbounded'
+ 				)
+ 		)
+ );
  
-/*
+ /*
- * Les photos  de la catégorie (un tableau indéxé qui contient les images avec leur vignette)
+  * An image
  */
-$server->wsdl->addComplexType(
+ $server->wsdl->addComplexType(
-	'PhotosArray',
+ 		'image',
-    'complexType',
+ 		'complexType',
-    'array',
+ 		'struct',
-    '',
+ 		'all',
-    'SOAP-ENC:Array',
+ 		'',
-    array(),
+ 		array(
-    array(
+ 				'photo' => array('name'=>'photo','type'=>'xsd:string'),
-        array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'tns:image[]')
+ 				'photo_vignette' => array('name'=>'photo_vignette','type'=>'xsd:string'),
-    ),
+ 				'imgWidth' => array('name'=>'imgWidth','type'=>'xsd:string'),
-	''
+ 				'imgHeight' => array('name'=>'imgHeight','type'=>'xsd:string')
-);
+ 		)
-
+ );
-/*
- * Une photo ( nom image / nom_vignette )
- */
-$server->wsdl->addComplexType(
- 	'image',
- 	'complexType',
- 	'array',
- 	'',
- 	'SOAP-ENC:Array',
- 	array(),
- 	array(
-	 	'photo' => array('name'=>'photo','type'=>'xsd:string'),
-	 	'photo_vignette' => array('name'=>'photo_vignette','type'=>'xsd:string'),
-	 	'imgWidth' => array('name'=>'imgWidth','type'=>'xsd:string'),
-	 	'imgHeight' => array('name'=>'imgHeight','type'=>'xsd:string')
-	)
-);
 
 /*
  * Retour