diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index a23a620359e..d63b0e7acb0 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -2545,7 +2545,7 @@ class Contrat extends CommonObject if (!$error) { foreach ($this->lines as $line) { - $result = $clonedObj->addline($line->desc, $line->subprice, $line->qty, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, $line->fk_product, $line->remise_percent, $line->date_ouverture, $line->date_cloture, 'HT', 0, $line->info_bits, $line->fk_fournprice, $line->pa_ht, $line->array_options, $line->fk_unit); + $result = $clonedObj->addline($line->description, $line->subprice, $line->qty, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, $line->fk_product, $line->remise_percent, $line->date_ouverture, $line->date_cloture, 'HT', 0, $line->info_bits, $line->fk_fournprice, $line->pa_ht, $line->array_options, $line->fk_unit); if ($result < 0) { $error++; $this->error = $clonedObj->error; diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php index dbf2f3dd125..554f7e7e996 100644 --- a/htdocs/webservices/server_thirdparty.php +++ b/htdocs/webservices/server_thirdparty.php @@ -103,7 +103,7 @@ $thirdparty_fields = array( 'address' => array('name'=>'address', 'type'=>'xsd:string'), 'zip' => array('name'=>'zip', 'type'=>'xsd:string'), 'town' => array('name'=>'town', 'type'=>'xsd:string'), - 'province_id' => array('name'=>'province_id', 'type'=>'xsd:string'), + 'region_code' => array('name'=>'region_code', 'type'=>'xsd:string'), 'country_id' => array('name'=>'country_id', 'type'=>'xsd:string'), 'country_code' => array('name'=>'country_code', 'type'=>'xsd:string'), 'country' => array('name'=>'country', 'type'=>'xsd:string'), @@ -343,7 +343,7 @@ function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '', $bar 'address' => $thirdparty->address, 'zip' => $thirdparty->zip, 'town' => $thirdparty->town, - 'province_id' => $thirdparty->state_id, + 'region_code' => $thirdparty->region_code, 'country_id' => $thirdparty->country_id, 'country_code' => $thirdparty->country_code, 'country' => $thirdparty->country, @@ -462,7 +462,7 @@ function createThirdParty($authentication, $thirdparty) if ($thirdparty['country_code']) { $newobject->country_id = getCountry($thirdparty['country_code'], 3); } - $newobject->province_id = $thirdparty['province_id']; + $newobject->region_code = $thirdparty['region_code']; //if ($thirdparty['province_code']) $newobject->province_code=getCountry($thirdparty['province_code'],3); $newobject->phone = $thirdparty['phone']; @@ -597,7 +597,7 @@ function updateThirdParty($authentication, $thirdparty) if ($thirdparty['country_code']) { $object->country_id = getCountry($thirdparty['country_code'], 3); } - $object->province_id = $thirdparty['province_id']; + $object->region_code = $thirdparty['region_code']; //if ($thirdparty['province_code']) $newobject->province_code=getCountry($thirdparty['province_code'],3); $object->phone = $thirdparty['phone'];