diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php index eb5551e2a82..d3e7691f05a 100644 --- a/htdocs/compta/deplacement/class/deplacement.class.php +++ b/htdocs/compta/deplacement/class/deplacement.class.php @@ -361,7 +361,7 @@ class Deplacement extends CommonObject $sql.= " FROM ".MAIN_DB_PREFIX."c_type_fees"; $sql.= " WHERE active = ".$active; - dol_syslog("Deplacement::listOfTypes sql=".$sql, LOG_DEBUG); + dol_syslog(get_class($this)."::listOfTypes sql=".$sql, LOG_DEBUG); $result = $this->db->query($sql); if ( $result ) { @@ -370,11 +370,14 @@ class Deplacement extends CommonObject while ($i < $num) { $obj = $this->db->fetch_object($result); - $ret[$obj->id]=array('code'=>$obj->code, 'label'=>(($langs->trans($obj->code)!=$obj->code)?$langs->trans($obj->code):$obj->label)); + $ret[$obj->code]=(($langs->trans($obj->code)!=$obj->code)?$langs->trans($obj->code):$obj->label); $i++; } } - else dol_print_error($this->db); + else + { + dol_print_error($this->db); + } return $ret; } diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php index 7c72d94b83a..1f3c6438536 100644 --- a/htdocs/compta/deplacement/fiche.php +++ b/htdocs/compta/deplacement/fiche.php @@ -339,13 +339,15 @@ else if ($id) print ''; // Ref - print ""; - print ''; // Type - print ''; + print ''; // Who print ''; print "\n"; $listoftype=$tripandexpense_static->listOfTypes(); -foreach ($listoftype as $typefee) +foreach ($listoftype as $code => $label) { - $dataseries[]=array('label'=>$typefee['label'],'values'=>array(0=>(isset($nb[$typefee['code']])?$nb[$typefee['code']]:0))); + $dataseries[]=array('label'=>$label,'values'=>array(0=>(isset($nb[$code])?$nb[$code]:0))); } if ($conf->use_javascript_ajax) diff --git a/htdocs/core/ajax/loadinplace.php b/htdocs/core/ajax/loadinplace.php index 88af8e50ef5..f45dc8dd80c 100644 --- a/htdocs/core/ajax/loadinplace.php +++ b/htdocs/core/ajax/loadinplace.php @@ -54,9 +54,16 @@ if((isset($_GET['field']) && ! empty($_GET['field'])) if ($user->rights->$element->lire || $user->rights->$element->read) { - $object = new GenericObject($db); - $value=$object->getValueFrom($table_element, $fk_element, $field); - echo $value; + if ($type == 'select') + { + echo json_encode(array("Aberdeen", "Ada", "Adamsville", "Addyston", "Adelphi", "Adena", "Adrian", "Akron")); + } + else + { + $object = new GenericObject($db); + $value=$object->getValueFrom($table_element, $fk_element, $field); + echo $value; + } } else { diff --git a/htdocs/core/js/editinplace.js b/htdocs/core/js/editinplace.js index 9e905f43cc8..1ea15604de6 100644 --- a/htdocs/core/js/editinplace.js +++ b/htdocs/core/js/editinplace.js @@ -125,4 +125,48 @@ $(document).ready(function() { } } }); + $('.edit_select').editable(urlSaveInPlace, { + type : 'select', + id : 'field', + onblur : 'ignore', + cssclass : 'flat', + tooltip : tooltipInPlace, + placeholder : placeholderInPlace, + cancel : cancelInPlace, + submit : submitInPlace, + indicator : indicatorInPlace, + loadurl : urlLoadInPlace, + loaddata : { + type: 'select', + element: element, + table_element: table_element, + fk_element: fk_element + }, + submitdata : { + type: 'select', + element: element, + table_element: table_element, + fk_element: fk_element + }, + callback : function(result, settings) { + var obj = $.parseJSON(result); + + if (obj.error) { + $(this).html(this.revert); + $.jnotify(obj.error, "error", true); + } else { + $(this).html(obj.value); + } + } + }); + $('.edit_autocomplete').editable(urlSaveInPlace, { + type : 'autocomplete', + id : 'field', + onblur : 'submit', + tooltip : tooltipInPlace, + indicator : indicatorInPlace, + autocomplete : { + data : ["Aberdeen", "Ada", "Adamsville", "Addyston", "Adelphi", "Adena", "Adrian", "Akron"] + } + }); }); \ No newline at end of file diff --git a/htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.ui-autocomplete.js b/htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.ui-autocomplete.js new file mode 100644 index 00000000000..6983002ef56 --- /dev/null +++ b/htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.ui-autocomplete.js @@ -0,0 +1,9 @@ +/* Create an inline datepicker which leverages the + jQuery UI autocomplete +*/ +$.editable.addInputType('autocomplete', { + element : $.editable.types.text.element, + plugin : function(settings, original) { + $('input', this).autocomplete(settings.autocomplete.data); + } +}); \ No newline at end of file diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index e316daa44a7..9a259fe35e1 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -932,6 +932,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs { print ''."\n"; print ''."\n"; + print ''."\n"; print '
'.$langs->trans("Ref").''; + print '
'.$langs->trans("Ref").''; print $form->showrefnav($object,'id','',1,'rowid','ref',''); print '
'.$langs->trans("Type").''.$langs->trans($object->type).'
'.$langs->trans("Type").''; + print $form->editInPlace($langs->trans($object->type), 'type', $user->rights->deplacement->creer, 'select'); + //print $langs->trans($object->type); + print '
'.$langs->trans("Person").''; diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php index 995ae8966c4..e4ebbfe2021 100644 --- a/htdocs/compta/deplacement/index.php +++ b/htdocs/compta/deplacement/index.php @@ -102,9 +102,9 @@ print ''.$langs->trans("Statistics").'