lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1265 from FHenry/3.4

Browse Source 
Fix bad display IE for checkbox extrafield readonly
This commit is contained in:
Laurent Destailleur 2013-10-26 17:15:00 -07:00
commit 686babd0dc
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/compta/facture/class/facture.class.php
View File

@ -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)."'"; $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 if (! empty($conf->global->FAC_FORCE_DATE_VALIDATION)) // If option enabled, we force invoice date
{ {
$sql.= ', datef='.$this->db->idate($this->date); $sql.= ", datef='".$this->db->idate($this->date)."'";
$sql.= ', date_lim_reglement='.$this->db->idate($this->date_lim_reglement); $sql.= ", date_lim_reglement='".$this->db->idate($this->date_lim_reglement)."'";
} }
$sql.= ' WHERE rowid = '.$this->id; $sql.= ' WHERE rowid = '.$this->id;

2
htdocs/core/class/extrafields.class.php
View File

@ -806,7 +806,7 @@ class ExtraFields
if (!empty($value)) { if (!empty($value)) {
$checked=' checked="checked" '; $checked=' checked="checked" ';
} }
$value='<input type="checkbox" '.$checked.' '.($moreparam?$moreparam:'').' readonly="readonly">'; $value='<input type="checkbox" '.$checked.' '.($moreparam?$moreparam:'').' readonly="readonly" disabled="disabled">';
} }
elseif ($type == 'mail') elseif ($type == 'mail')
{ {

1
htdocs/webservices/admin/webservices.php
View File

@ -102,6 +102,7 @@ print '<br><br>';
$webservices = array( $webservices = array(
'user' => '', 'user' => '',
'thirdparty' => '!empty($conf->societe->enabled)', 'thirdparty' => '!empty($conf->societe->enabled)',
'contact' => '!empty($conf->societe->enabled)',
'productorservice' => '(!empty($conf->product->enabled) || !empty($conf->service->enabled))', 'productorservice' => '(!empty($conf->product->enabled) || !empty($conf->service->enabled))',
'order' => '!empty($conf->commande->enabled)', 'order' => '!empty($conf->commande->enabled)',
'invoice' => '!empty($conf->facture->enabled)', 'invoice' => '!empty($conf->facture->enabled)',

8
htdocs/webservices/server_contact.php
View File

@ -300,7 +300,7 @@ function getContact($authentication,$id,$ref='',$ref_ext='')
'ref_propal' => $contact->ref_propal, 'ref_propal' => $contact->ref_propal,
'user_id' => $contact->user_id, 'user_id' => $contact->user_id,
'user_login' => $contact->user_login, 'user_login' => $contact->user_login,
'civility_id' => $contact->civility_id 'civilite_id' => $contact->civility_id
); );
//Retreive all extrafield for thirdsparty //Retreive all extrafield for thirdsparty
@ -379,7 +379,7 @@ function createContact($authentication,$contact)
$newobject=new Contact($db); $newobject=new Contact($db);
$newobject->id=$contact['id']; $newobject->id=$contact['id'];
$newobject->civility_id=$contact['civility_id']; $newobject->civilite_id=$contact['civility_id'];
$newobject->lastname=$contact['lastname']; $newobject->lastname=$contact['lastname'];
$newobject->firstname=$contact['firstname']; $newobject->firstname=$contact['firstname'];
$newobject->address=$contact['address']; $newobject->address=$contact['address'];
@ -522,7 +522,7 @@ function getContactsForThirdParty($authentication,$idthirdparty)
$linescontact[]=array( $linescontact[]=array(
'id' => $contact->id, 'id' => $contact->id,
'ref' => $contact->ref, 'ref' => $contact->ref,
'civility_id' => $contact->civility_id?$contact->civility_id:'', 'civility_id' => $contact->civilite_id?$contact->civilite_id:'',
'lastname' => $contact->lastname?$contact->lastname:'', 'lastname' => $contact->lastname?$contact->lastname:'',
'firstname' => $contact->firstname?$contact->firstname:'', 'firstname' => $contact->firstname?$contact->firstname:'',
'address' => $contact->address?$contact->address:'', 'address' => $contact->address?$contact->address:'',
@ -653,6 +653,8 @@ function updateContact($authentication,$contact)
$object->fax=$contact['fax']; $object->fax=$contact['fax'];
$object->email=$contact['email']; $object->email=$contact['email'];
$object->civilite_id=$contact['civility_id'];
//Retreive all extrafield for contact //Retreive all extrafield for contact
// fetch optionals attributes and labels // fetch optionals attributes and labels