Fix position of fields

htdocs/api/class/api.class.php

@@ -131,6 +131,9 @@ class DolibarrApi
         unset($object->table_element_line);
         unset($object->picto);
 
+        unset($object->skip_update_total);
+        unset($object->context);
+
         // Remove the $oldcopy property because it is not supported by the JSON
         // encoder. The following error is generated when trying to serialize
         // it: "Error encoding/decoding JSON: Type is not supported"

htdocs/comm/propal/class/api_proposals.class.php

@@ -278,7 +278,7 @@ class Proposals extends DolibarrApi
                         $request_data->fk_unit,
                         $this->element,
                         $request_data->id,
-                        $request_data->pu_ht_devise,
+                        $request_data->multicurrency_subprice,
                         $request_data->fk_remise_except
       );
 
@@ -316,26 +316,27 @@ class Proposals extends DolibarrApi
 			$request_data = (object) $request_data;
       $updateRes = $this->propal->updateline(
                         $lineid,
-                        $request_data->desc,
                         $request_data->subprice,
                         $request_data->qty,
                         $request_data->remise_percent,
                         $request_data->tva_tx,
                         $request_data->localtax1_tx,
                         $request_data->localtax2_tx,
-                        'HT',
+                        $request_data->desc,
+      					'HT',
                         $request_data->info_bits,
-                        $request_data->date_start,
-                        $request_data->date_end,
-                        $request_data->product_type,
-                        $request_data->fk_parent_line,
-                        0,
-                        $request_data->fk_fournprice,
-                        $request_data->pa_ht,
-                        $request_data->label,
                         $request_data->special_code,
+                        $request_data->fk_parent_line,
+      					0,
+      					$request_data->fk_fournprice,
+      					$request_data->pa_ht,
+      					$request_data->label,
+				      	$request_data->product_type,
+      					$request_data->date_start,
+                        $request_data->date_end,
                         $request_data->array_options,
-                        $request_data->fk_unit
+                        $request_data->fk_unit,
+      					$request_data->multicurrency_subprice
       );
 
       if ($updateRes > 0) {
@@ -508,4 +509,23 @@ class Proposals extends DolibarrApi
         }
         return $propal;
     }
+
+    /**
+     * Clean sensible object datas
+     *
+     * @param   object  $object    Object to clean
+     * @return    array    Array of cleaned object properties
+     */
+    function _cleanObjectDatas($object) {
+
+    	$object = parent::_cleanObjectDatas($object);
+
+    	unset($object->name);
+    	unset($object->lastname);
+    	unset($object->firstname);
+    	unset($object->civility_id);
+    	unset($object->address);
+
+    	return $object;
+    }
 }