diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 4916e7bf6ef..d7b17f3ac20 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -1736,8 +1736,8 @@ class Facture extends CommonInvoice $sql.= " SET facnumber='".$num."', fk_statut = 1, fk_user_valid = ".$user->id.", date_valid = '".$this->db->idate($now)."'"; if (! empty($conf->global->FAC_FORCE_DATE_VALIDATION)) // If option enabled, we force invoice date { - $sql.= ', datef='.$this->db->idate($this->date); - $sql.= ', date_lim_reglement='.$this->db->idate($this->date_lim_reglement); + $sql.= ", datef='".$this->db->idate($this->date)."'"; + $sql.= ", date_lim_reglement='".$this->db->idate($this->date_lim_reglement)."'"; } $sql.= ' WHERE rowid = '.$this->id; diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index a55b76e4ce2..48a4c8020b3 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -806,7 +806,7 @@ class ExtraFields if (!empty($value)) { $checked=' checked="checked" '; } - $value=''; + $value=''; } elseif ($type == 'mail') { diff --git a/htdocs/webservices/admin/webservices.php b/htdocs/webservices/admin/webservices.php index 2de3c12df2c..7b71e5a0228 100644 --- a/htdocs/webservices/admin/webservices.php +++ b/htdocs/webservices/admin/webservices.php @@ -102,6 +102,7 @@ print '

'; $webservices = array( 'user' => '', 'thirdparty' => '!empty($conf->societe->enabled)', + 'contact' => '!empty($conf->societe->enabled)', 'productorservice' => '(!empty($conf->product->enabled) || !empty($conf->service->enabled))', 'order' => '!empty($conf->commande->enabled)', 'invoice' => '!empty($conf->facture->enabled)', diff --git a/htdocs/webservices/server_contact.php b/htdocs/webservices/server_contact.php index 08d21d5cba2..cfe25afbe4c 100644 --- a/htdocs/webservices/server_contact.php +++ b/htdocs/webservices/server_contact.php @@ -300,7 +300,7 @@ function getContact($authentication,$id,$ref='',$ref_ext='') 'ref_propal' => $contact->ref_propal, 'user_id' => $contact->user_id, 'user_login' => $contact->user_login, - 'civility_id' => $contact->civility_id + 'civilite_id' => $contact->civility_id ); //Retreive all extrafield for thirdsparty @@ -379,7 +379,7 @@ function createContact($authentication,$contact) $newobject=new Contact($db); $newobject->id=$contact['id']; - $newobject->civility_id=$contact['civility_id']; + $newobject->civilite_id=$contact['civility_id']; $newobject->lastname=$contact['lastname']; $newobject->firstname=$contact['firstname']; $newobject->address=$contact['address']; @@ -522,7 +522,7 @@ function getContactsForThirdParty($authentication,$idthirdparty) $linescontact[]=array( 'id' => $contact->id, 'ref' => $contact->ref, - 'civility_id' => $contact->civility_id?$contact->civility_id:'', + 'civility_id' => $contact->civilite_id?$contact->civilite_id:'', 'lastname' => $contact->lastname?$contact->lastname:'', 'firstname' => $contact->firstname?$contact->firstname:'', 'address' => $contact->address?$contact->address:'', @@ -653,6 +653,8 @@ function updateContact($authentication,$contact) $object->fax=$contact['fax']; $object->email=$contact['email']; + $object->civilite_id=$contact['civility_id']; + //Retreive all extrafield for contact // fetch optionals attributes and labels