From 3cd724a9ed89f29776a011fd8f4bf734f0959e20 Mon Sep 17 00:00:00 2001
From: Victor Saisa Lopez <victor@colosa.com>
Date: Wed, 27 Mar 2013 09:57:22 -0400
Subject: [PATCH] BUG 10920 "Add subtitles inside a drop-down" SOLVED

- New feature, add subtitles inside a drop-down
- Solved problem, added grouping elements in DropDowns
- If a DropDown has enabled optgroup, an example with SQL would be the following:
    (SELECT 'optgroup1' AS UID, 'Users' AS NAME)
    UNION
    (SELECT USR.USR_UID AS UID, USR.USR_USERNAME AS NAME
     FROM   USERS AS USR
     WHERE  USR.USR_USERNAME <> '' AND USR.USR_USERNAME LIKE 'u%'
    )
    UNION
    (SELECT 'optgroup2' AS UID, 'Countries' AS NAME)
    UNION
    (SELECT COUNTRY.IC_UID AS UID, COUNTRY.IC_NAME AS NAME
     FROM   ISO_COUNTRY AS COUNTRY
     WHERE  COUNTRY.IC_NAME LIKE 'b%'
    )
* Available from version ProcessMaker-2.0.47 (2.5.1)
---
 gulliver/js/form/core/form.js                 |  94 +++++--
 gulliver/js/grid/core/grid.js                 | 206 ++++++++-------
 gulliver/js/maborak/core/maborak.js           |  41 +--
 gulliver/system/class.xmlform.php             | 139 ++++++----
 .../engine/methods/dynaforms/fields_Edit.php  |  12 +-
 .../engine/methods/dynaforms/fields_Save.php  |   5 +
 .../xmlform/dynaforms/fields/_options.xml     |  14 +-
 .../xmlform/dynaforms/fields/dropdown.html    | 238 +++++++++---------
 .../xmlform/dynaforms/fields/dropdown.xml     |  91 ++++++-
 9 files changed, 531 insertions(+), 309 deletions(-)

diff --git a/gulliver/js/form/core/form.js b/gulliver/js/form/core/form.js
index 6c3115d6a..9959ec687 100755
--- a/gulliver/js/form/core/form.js
+++ b/gulliver/js/form/core/form.js
@@ -315,32 +315,12 @@ function G_DropDown( form, element, name )
   var me=this;
   this.parent = G_Field;
   this.parent( form, element, name );
-  this.setContent=function(content) {
-    var dd=me.element;
-    var browser = getBrowserClient();
-    if ((browser.name=='msie') || ((browser.name == 'firefox') && (browser.version < 12))){
-      while(dd.options.length>1) dd.remove(0);
-    } else {
-      for (var key in dd.options){
-        dd.options[key] = null;
-      }
-    }
 
-    dd.options.length = 0; //Delete options
-
-    // the remove function is no longer reliable
-    // while(dd.options.length>1) dd.remove(0);
-    for(var o=0;o<content.options.length;o++) {
-      var optn = $dce("OPTION");
-      optn.text = content.options[o].value;
-      optn.value = content.options[o].key;
-      dd.options[o]=optn;
-    }
-
-    if (dd.options.length == 0) {
-        dd.options[0] = new Option("", "");
-    }
+  this.setContent = function (content)
+  {
+      dropDownSetOption(me, content);
   };
+
   if (!element) return;
   leimnud.event.add(this.element,'change',this.updateDepententFields);
 }
@@ -3691,7 +3671,7 @@ function getNumericValue(val, decimalSeparator)
     return num;
 }
 
-var gridGetAllFieldAndValue = function (fieldId, swCurrentField)
+function gridGetAllFieldAndValue(fieldId, swCurrentField)
 {
     var frm = G.getObject(getField(fieldId).form);
 
@@ -3724,5 +3704,67 @@ var gridGetAllFieldAndValue = function (fieldId, swCurrentField)
     }
 
     return gridField;
-};
+}
+
+function dropDownSetOption(elem, arrayOption)
+{
+    var selectdd = elem.element;
+    var arraySelectddAttribute = document.getElementById("form[" + elem.name + "]").attributes;
+    var optGroupAux;
+    var optionAux;
+    var swOptGroup = 0;
+    var swOptGroupPrev = 0;
+    var swAppend = 0;
+    var i = 0;
+
+    for (i = 0; i <= arraySelectddAttribute.length - 1; i++) {
+        if (arraySelectddAttribute[i].name == "pm:optgroup") {
+            swOptGroup = parseInt(arraySelectddAttribute[i].value);
+        }
+    }
+
+    //selectdd.options.length = 0; //Delete options
+    selectdd.innerHTML = "";
+
+    for (i = 0; i <= arrayOption.options.length - 1; i++) {
+        if (swOptGroup == 1 && /^optgroup\d+$/.test(arrayOption.options[i].key)) {
+            optGroupAux = document.createElement("optgroup");
+
+            //selectdd.appendChild(optGroupAux);
+
+            optGroupAux.label = arrayOption.options[i].value;
+
+            swOptGroupPrev = 1;
+            swAppend = 1;
+        } else {
+            if (swOptGroupPrev == 1) {
+                //Append optGroupAux
+                if (swAppend == 1) {
+                    selectdd.appendChild(optGroupAux);
+
+                    swAppend = 0;
+                }
+
+                //Append optionAux
+                optionAux = document.createElement("option");
+
+                optGroupAux.appendChild(optionAux);
+
+                optionAux.value = arrayOption.options[i].key;
+                optionAux.text = arrayOption.options[i].value;
+            } else {
+                optionAux = document.createElement("option");
+
+                selectdd.appendChild(optionAux);
+
+                optionAux.value = arrayOption.options[i].key;
+                optionAux.text = arrayOption.options[i].value;
+            }
+        }
+    }
+
+    if (selectdd.options.length == 0) {
+        selectdd.options[0] = new Option("", "");
+    }
+}
 
diff --git a/gulliver/js/grid/core/grid.js b/gulliver/js/grid/core/grid.js
index 64293b9c9..af53afddb 100755
--- a/gulliver/js/grid/core/grid.js
+++ b/gulliver/js/grid/core/grid.js
@@ -266,7 +266,7 @@ var G_Grid = function(oForm, sGridName){
     for (i = 0; i <= arrayAux1.length - 1; i++) {
         arrayAux2 = arrayAux1[i].split("=");
 
-        if (typeof arrayAux2[1] != "undefined") {
+        if (typeof(arrayAux2[1]) != "undefined") {
             a = arrayAux2[0].trim();
             v = stringReplace("\\\"", "", arrayAux2[1]);
 
@@ -400,7 +400,7 @@ var G_Grid = function(oForm, sGridName){
               aObjects[0].name = newID;
               attributes = elementAttributesNS(aObjects[0], 'pm');
 
-              if (typeof attributes.defaultvalue != "undefined" && attributes.defaultvalue != "") {
+              if (typeof(attributes.defaultvalue) != "undefined" && attributes.defaultvalue != "") {
                   defaultValue = attributes.defaultvalue;
               } else {
                   defaultValue = "";
@@ -501,14 +501,14 @@ var G_Grid = function(oForm, sGridName){
                   case 'checkbox': //CHECKBOX
                       var attributeCheckBox = elementAttributesNS(aObjects[n], "");
 
-                      if (defaultValue == "" || (typeof attributeCheckBox.falseValue != "undefined" && defaultValue == attributeCheckBox.falseValue) || (typeof attributeCheckBox.falsevalue != "undefined" && defaultValue == attributeCheckBox.falsevalue)) {
+                      if (defaultValue == "" || (typeof(attributeCheckBox.falseValue) != "undefined" && defaultValue == attributeCheckBox.falseValue) || (typeof(attributeCheckBox.falsevalue) != "undefined" && defaultValue == attributeCheckBox.falsevalue)) {
                           aObjects[n].checked = false;
                       } else {
                           aObjects[n].checked = true;
                       }
                       break;
                   case 'hidden': //HIDDEN
-                    if ((attributes.gridtype != 'yesno' && attributes.gridtype != 'dropdown') || typeof attributes.gridtype == 'undefined') {
+                    if ((attributes.gridtype != "yesno" && attributes.gridtype != "dropdown") || typeof(attributes.gridtype) == "undefined") {
                         aObjects[n].value = defaultValue;
                         newID = aObjects[n].id.replace(/\[1\]/g, '\[' + currentRow + '\]');
                         aObjects[n].id = newID;
@@ -593,6 +593,7 @@ var G_Grid = function(oForm, sGridName){
               }
               var aDependents = this.allDependentFields.split(',');
               sObject = this.getObjectName(newID);
+
               //Check if dropdow is dependent
               var sw = false;
               for (x=0; x < aDependents.length; x++){
@@ -601,7 +602,8 @@ var G_Grid = function(oForm, sGridName){
 
               //Delete Options if dropdow is dependent
               //only remains empty value
-              if (sw){
+              if (sw) {
+                /*
                 oNewSelect.options.length = 0; //Delete options
 
                 var oAux = document.createElement(aObjects[0].tagName);
@@ -624,52 +626,18 @@ var G_Grid = function(oForm, sGridName){
                   //aObjects[0].options.add(xOption);
                   oNewSelect.options.add(xOption);
                 }
+                */
+                  //oNewSelect.options.length = 0; //Delete options
+                  oNewSelect.innerHTML = "";
 
-                if (oNewSelect.options.length == 0) {
-                    oNewSelect.options[0] = new Option("", "");
-                }
-              }else{
-                //Set Default Value if it's not a Dependent Field
-                if (defaultValue != ''){
-                  var oAux = document.createElement(aObjects[0].tagName);
-                  for ( var j = 0; j < aObjects[0].options.length; j++) {
-                    var oOption = document.createElement('OPTION');
-                    oOption.value = aObjects[0].options[j].value;
-                    oOption.text = aObjects[0].options[j].text;
-                    if (aObjects[0].options[j].value === defaultValue){
-                      oOption.setAttribute('selected','selected');
-                    }
-                    oAux.options.add(oOption);
+                  if (oNewSelect.options.length == 0) {
+                      oNewSelect.options[0] = new Option("", "");
                   }
-                  //aObjects[0].innerHTML = ''; //Delete options
-                  oNewSelect.innerHTML = ''; //Delete options
-                  for (var r =0; r < oAux.options.length; r++){
-                    var xOption = document.createElement('OPTION');
-                    xOption.value = oAux.options[r].value;
-                    xOption.text = oAux.options[r].text;
-                    if (_BROWSER.name == 'msie'){
-                      if (oAux.options[r].getAttribute('selected') != ''){
-                        xOption.setAttribute('selected','selected');
-                      }
-                    }else{
-                      if (oAux.options[r].getAttribute('selected') == 'selected'){
-                        xOption.setAttribute('selected','selected');
-                      }
-                    }
-                    //aObjects[0].options.add(xOption);
-                    oNewSelect.options.add(xOption);
-                  }
-                }else{
-                  //Copy all options
-                  var oAux = document.createElement(aObjects[0].tagName);
-                  for ( var j = 0; j < aObjects[0].options.length; j++) {
-                    var oOption = document.createElement('OPTION');
-                    oOption.value = aObjects[0].options[j].value;
-                    oOption.text = aObjects[0].options[j].text;
-                    oNewSelect.options.add(oOption);
-                  }
-                }
-                //TODO: Implement Default Value and Dependent Fields Trigger for grid dropdowns
+              } else {
+                  //Set Default Value if it's not a Dependent Field
+                  selectCloneOption.call(oNewSelect, aObjects[0], defaultValue);
+
+                  //TODO: Implement Default Value and Dependent Fields Trigger for grid dropdowns
               }
 
               var parentSelect = aObjects[0].parentNode;
@@ -768,7 +736,7 @@ var G_Grid = function(oForm, sGridName){
 
   this.deleteGridRow = function (sRow, bWithoutConfirm)
   {
-      if (typeof bWithoutConfirm == "undefined") {
+      if (typeof(bWithoutConfirm) == "undefined") {
           bWithoutConfirm = false;
       }
 
@@ -870,27 +838,17 @@ var G_Grid = function(oForm, sGridName){
             }
 
             break;
-          case '<selec':
-            aObjects1 = oCell1.getElementsByTagName('select');
-            aObjects2 = oCell2.getElementsByTagName('select');
-            if (aObjects1 && aObjects2) {
-              var vValue = aObjects2[0].value;
-              /*
-               * for (var j = (aObjects1[0].options.length-1);
-               * j >= 0; j--) { aObjects1[0].options[j] =
-               * null; }
-               */
-              aObjects1[0].options.length = 0;
-              for ( var j = 0; j < aObjects2[0].options.length; j++) {
-                var optn = $dce("OPTION");
-                optn.text = aObjects2[0].options[j].text;
-                optn.value = aObjects2[0].options[j].value;
-                aObjects1[0].options[j] = optn;
+          case "<selec":
+              aObjects1 = oCell1.getElementsByTagName("select");
+              aObjects2 = oCell2.getElementsByTagName("select");
+
+              if (aObjects1 && aObjects2) {
+                  selectCloneOption.call(aObjects1[0], aObjects2[0], "");
+
+                  aObjects1[0].value = aObjects2[0].value;
+                  aObjects1[0].className = aObjects2[0].className;
               }
-              aObjects1[0].value = vValue;
-              aObjects1[0].className = aObjects2[0].className;
-            }
-            break;
+              break;
           case '<texta':
             aObjects1 = oCell1.getElementsByTagName('textarea');
             aObjects2 = oCell2.getElementsByTagName('textarea');
@@ -1322,26 +1280,16 @@ var G_Grid = function(oForm, sGridName){
             }
             //oCell1.innerHTML= aux.innerHTM;
             break;
-          case '<selec':
-            aObjects1 = oCell1.getElementsByTagName('select');
-            aObjects2 = oCell2.getElementsByTagName('select');
-            if (aObjects1 && aObjects2) {
-              var vValue = aObjects2[0].value;
-              /*
-               * for (var j = (aObjects1[0].options.length-1);
-               * j >= 0; j--) { aObjects1[0].options[j] =
-               * null; }
-               */
-              aObjects1[0].options.length = 0;
-              for ( var j = 0; j < aObjects2[0].options.length; j++) {
-                var optn = $dce("OPTION");
-                optn.text = aObjects2[0].options[j].text;
-                optn.value = aObjects2[0].options[j].value;
-                aObjects1[0].options[j] = optn;
+          case "<selec":
+              aObjects1 = oCell1.getElementsByTagName("select");
+              aObjects2 = oCell2.getElementsByTagName("select");
+
+              if (aObjects1 && aObjects2) {
+                  selectCloneOption.call(aObjects1[0], aObjects2[0], "");
+
+                  aObjects1[0].value = aObjects2[0].value;
               }
-              aObjects1[0].value = vValue;
-            }
-            break;
+              break;
           case '<texta':
             aObjects1 = oCell1.getElementsByTagName('textarea');
             aObjects2 = oCell2.getElementsByTagName('textarea');
@@ -1490,3 +1438,83 @@ function deleteRowOnDynaform(grid, sRow) {
   oRPC.make();
 }
 
+function selectCloneOption(selectOrigin, defaultValue)
+{
+    var arrayOption = [];
+    var arrayOptGroup = [];
+    var arrayOptGroupOption = [];
+    var arrayAux = [];
+    var optGroupAux;
+    var optionAux;
+    var i1 = 0;
+    var i2 = 0;
+    var i3 = 0;
+    var swSelected = 0;
+
+    //this.options.length = 0; //Delete options
+    this.innerHTML = "";
+
+    for (i1 = 0; i1 <= selectOrigin.options.length - 1; i1++) {
+        if (selectOrigin.options[i1].parentNode.nodeName.toLowerCase() != "optgroup") {
+            arrayOption.push(["option", selectOrigin.options[i1].value, selectOrigin.options[i1].text]);
+        } else {
+            if (typeof(arrayAux[selectOrigin.options[i1].parentNode.label]) == "undefined") {
+                arrayAux[selectOrigin.options[i1].parentNode.label] = 1;
+                arrayOption.push(["optgroup", 1, selectOrigin.options[i1].parentNode.label]);
+            }
+        }
+    }
+
+    for (i1 = 0; i1 <= arrayOption.length - 1; i1++) {
+        if (arrayOption[i1][0] == "option") {
+            //this.appendChild(new Option(arrayOption[i1][2], arrayOption[i1][1]));
+            optionAux = document.createElement("option");
+
+            this.appendChild(optionAux);
+
+            optionAux.value = arrayOption[i1][1];
+            optionAux.text = arrayOption[i1][2];
+
+            if (swSelected == 0 && defaultValue != "" && arrayOption[i1][1] == defaultValue) {
+                optionAux.setAttribute("selected", "selected");
+                swSelected = 1;
+            }
+        } else {
+            arrayOptGroup = selectOrigin.getElementsByTagName("optgroup");
+
+            for (i2 = 0; i2 <= arrayOptGroup.length - 1; i2++) {
+                if (arrayOptGroup[i2].label == arrayOption[i1][2]) {
+                    arrayOptGroupOption = arrayOptGroup[i2].getElementsByTagName("option");
+
+                    if (arrayOptGroupOption.length > 0) {
+                        optGroupAux = document.createElement("optgroup");
+
+                        this.appendChild(optGroupAux);
+
+                        optGroupAux.label = arrayOptGroup[i2].label;
+
+                        for (i3 = 0; i3 <= arrayOptGroupOption.length - 1; i3++) {
+                            //optGroupAux.appendChild(new Option(arrayOptGroupOption[i3].text, arrayOptGroupOption[i3].value));
+                            optionAux = document.createElement("option");
+
+                            optGroupAux.appendChild(optionAux);
+
+                            optionAux.value = arrayOptGroupOption[i3].value;
+                            optionAux.text = arrayOptGroupOption[i3].text;
+
+                            if (swSelected == 0 && defaultValue != "" && arrayOptGroupOption[i3].value == defaultValue) {
+                                optionAux.setAttribute("selected", "selected");
+                                swSelected = 1;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    if (this.options.length == 0) {
+        this.options[0] = new Option("", "");
+    }
+}
+
diff --git a/gulliver/js/maborak/core/maborak.js b/gulliver/js/maborak/core/maborak.js
index 7ce81277d..2308e45ba 100644
--- a/gulliver/js/maborak/core/maborak.js
+++ b/gulliver/js/maborak/core/maborak.js
@@ -966,9 +966,8 @@ return true;};this.setValue=function(newValue){me.element.value=newValue;};this.
 switch(typeof(attributes[a])){case'string':case'int':case'boolean':if(a!='strTo'){switch(true){case typeof(me[a])==='undefined':case typeof(me[a])==='object':case typeof(me[a])==='function':case a==='isObject':case a==='isArray':break;default:me[a]=attributes[a];}}
 else{me[a]=attributes[a];}}}};this.value=function(){return me.element.value;};this.toJSONString=function(){return'{"'+me.name+'":'+me.element.value.toJSONString()+'}';};this.highLight=function(){try{G.highLight(me.element);if(G.autoFirstField){me.element.focus();G.autoFirstField=false;setTimeout("G.autoFirstField=true;",1000);}}catch(e){}};}
 function G_DropDown(form,element,name)
-{var me=this;this.parent=G_Field;this.parent(form,element,name);this.setContent=function(content){var dd=me.element;var browser=getBrowserClient();if((browser.name=='msie')||((browser.name=='firefox')&&(browser.version<12))){while(dd.options.length>1)dd.remove(0);}else{for(var key in dd.options){dd.options[key]=null;}}
-dd.options.length=0;for(var o=0;o<content.options.length;o++){var optn=$dce("OPTION");optn.text=content.options[o].value;optn.value=content.options[o].key;dd.options[o]=optn;}
-if(dd.options.length==0){dd.options[0]=new Option("","");}};if(!element)return;leimnud.event.add(this.element,'change',this.updateDepententFields);}
+{var me=this;this.parent=G_Field;this.parent(form,element,name);this.setContent=function(content)
+{dropDownSetOption(me,content);};if(!element)return;leimnud.event.add(this.element,'change',this.updateDepententFields);}
 G_DropDown.prototype=new G_Field();function G_Text(form,element,name)
 {var me=this;this.mType="text";this.parent=G_Field;this.browser={};this.comma_separator=".";this.checkBrowser=function(){var nVer=navigator.appVersion;var nAgt=navigator.userAgent;var browserName=navigator.appName;var fullVersion=''+parseFloat(navigator.appVersion);var majorVersion=parseInt(navigator.appVersion,10);var nameOffset,verOffset,ix;if((verOffset=nAgt.indexOf("Opera"))!=-1){browserName="Opera";fullVersion=nAgt.substring(verOffset+6);if((verOffset=nAgt.indexOf("Version"))!=-1)
 fullVersion=nAgt.substring(verOffset+8);}
@@ -1269,9 +1268,14 @@ return newStr;}
 function getNumericValue(val,decimalSeparator)
 {var arrayNum=val.split("");var num="";for(var i=0;i<=arrayNum.length-1;i++){switch(arrayNum[i]){case"0":case"1":case"2":case"3":case"4":case"5":case"6":case"7":case"8":case"9":num=num+arrayNum[i];break;case decimalSeparator:num=num+".";break;}}
 return num;}
-var gridGetAllFieldAndValue=function(fieldId,swCurrentField)
+function gridGetAllFieldAndValue(fieldId,swCurrentField)
 {var frm=G.getObject(getField(fieldId).form);var arrayAux=fieldId.split("][");var gridName=arrayAux[0];var row=parseInt(arrayAux[1]);var fieldName=arrayAux[2];var grid;var gridField="";var fieldNameAux="";var fieldValueAux="";var i1=0;var i2=0;for(i1=0;i1<=frm.aElements.length-1;i1++){if(frm.aElements[i1].name==gridName){grid=frm.aElements[i1];for(i2=0;i2<=grid.aFields.length-1;i2++){fieldNameAux=grid.aFields[i2].sFieldName;fieldValueAux=grid.getElementByName(row,fieldNameAux).value();if((swCurrentField==1||fieldNameAux!=fieldName)&&typeof fieldValueAux!="undefined"){gridField=gridField+((gridField!="")?",":"")+"\""+fieldNameAux+"\":\""+fieldValueAux+"\"";}}}}
-return gridField;};
+return gridField;}
+function dropDownSetOption(elem,arrayOption)
+{var selectdd=elem.element;var arraySelectddAttribute=document.getElementById("form["+elem.name+"]").attributes;var optGroupAux;var optionAux;var swOptGroup=0;var swOptGroupPrev=0;var swAppend=0;var i=0;for(i=0;i<=arraySelectddAttribute.length-1;i++){if(arraySelectddAttribute[i].name=="pm:optgroup"){swOptGroup=parseInt(arraySelectddAttribute[i].value);}}
+selectdd.innerHTML="";for(i=0;i<=arrayOption.options.length-1;i++){if(swOptGroup==1&&/^optgroup\d+$/.test(arrayOption.options[i].key)){optGroupAux=document.createElement("optgroup");optGroupAux.label=arrayOption.options[i].value;swOptGroupPrev=1;swAppend=1;}else{if(swOptGroupPrev==1){if(swAppend==1){selectdd.appendChild(optGroupAux);swAppend=0;}
+optionAux=document.createElement("option");optGroupAux.appendChild(optionAux);optionAux.value=arrayOption.options[i].key;optionAux.text=arrayOption.options[i].value;}else{optionAux=document.createElement("option");selectdd.appendChild(optionAux);optionAux.value=arrayOption.options[i].key;optionAux.text=arrayOption.options[i].value;}}}
+if(selectdd.options.length==0){selectdd.options[0]=new Option("","");}}
 function G_PagedTable()
 {this.id='';this.name='';this.event='';this.element=null;this.field='';this.ajaxUri='';this.currentOrder='';this.currentFilter='';this.currentPage=1;this.totalRows=0;this.rowsPerPage=25;this.onInsertField='';this.onDeleteField='';this.afterDeleteField='';this.onUpdateField='';this.form;var me=this;function loadTable(func,uri){var div=document.getElementById('table['+me.id+']');var newContent=ajax_function(me.ajaxUri,func,uri);if(div.outerHTML){div.outerHTML=div.outerHTML.split(div.innerHTML).join(newContent);}else{div.innerHTML=newContent;}
 var myScripts=div.getElementsByTagName('SCRIPT');for(var rr=0;rr<myScripts.length;rr++){try{if(myScripts[rr].innerHTML!=='')
@@ -1342,7 +1346,7 @@ strHtml=stringReplace("<"+tag,"",strHtml);strHtml=stringReplace("<"+tag.toLowerC
 strAux=strHtmlAux+strAux;strHtml=strAux;if(/^.*read[oO]nly.*$/.test(strHtml)){if(!(/^.*read[oO]nly\=.*$/.test(strHtml))){strHtml=stringReplace("read[oO]nly","readonly=\"\"",strHtml);}}
 if(/^.*disabled.*$/.test(strHtml)){if(!(/^.*disabled\=.*$/.test(strHtml))){strHtml=stringReplace("disabled","disabled=\"\"",strHtml);}}
 if(/^.*checked.*$/i.test(strHtml)){strHtml=stringReplace("CHECKED","checked",strHtml);if(!(/^.*checked\=.*$/.test(strHtml))){strHtml=stringReplace("checked","checked=\"\"",strHtml);}}
-var arrayAttribute=[];var a="";var v="";arrayAux1=strHtml.split(" ");for(i=0;i<=arrayAux1.length-1;i++){arrayAux2=arrayAux1[i].split("=");if(typeof arrayAux2[1]!="undefined"){a=arrayAux2[0].trim();v=stringReplace("\\\"","",arrayAux2[1]);v=stringReplace("__SPACE__"," ",v);arrayAttribute.push([a,v]);}}
+var arrayAttribute=[];var a="";var v="";arrayAux1=strHtml.split(" ");for(i=0;i<=arrayAux1.length-1;i++){arrayAux2=arrayAux1[i].split("=");if(typeof(arrayAux2[1])!="undefined"){a=arrayAux2[0].trim();v=stringReplace("\\\"","",arrayAux2[1]);v=stringReplace("__SPACE__"," ",v);arrayAttribute.push([a,v]);}}
 var newElem=document.createElement(tag.toLowerCase());for(i=0;i<=arrayAttribute.length-1;i++){a=arrayAttribute[i][0];v=arrayAttribute[i][1];switch(a.toLowerCase()){case"id":case"name":newElem.setAttribute("id",elem.id);newElem.setAttribute("name",elem.id);break;case"class":newElem.className=v;break;case"style":newElem.style.cssText=((/^.*display\s*:\s*none.*$/i.test(strHtml))?"display: none;":"")+v;break;case"disabled":if(elem.disabled){newElem.disabled=true;}
 break;case"readonly":if(elem.readOnly){newElem.readOnly=true;}
 break;case"checked":if(elem.checked){newElem.checked=true;}
@@ -1351,14 +1355,14 @@ switch(tag.toLowerCase()){case"input":case"textarea":newElem.value=elem.value;br
 newElem.options[i]=new Option(elem.options[i].text,elem.options[i].value,elem.options[i].defaultSelected);}
 newElem.options[pos].selected=true;}
 break;}
-return newElem;};this.replaceHtml=function(el,html){var oldEl=typeof el==="string"?document.getElementById(el):el;if(this.determineBrowser()=="MSIE"){oldEl.innerHTML=html;return oldEl;}else{var newEl=oldEl.cloneNode(false);newEl.innerHTML=html;oldEl.parentNode.replaceChild(newEl,oldEl);return newEl;}};this.addGridRow=function(){this.oGrid=document.getElementById(this.sGridName);var i,aObjects;var defaultValue='';var n,a,x;var oRow=document.getElementById('firstRow_'+this.sGridName);var aCells=oRow.getElementsByTagName('td');var oNewRow=this.oGrid.insertRow(this.oGrid.rows.length-1);var currentRow=this.oGrid.rows.length-2;var newID,attributes,img2,gridType;oNewRow.onmouseover=function(){highlightRow(this,'#D9E8FF');};oNewRow.onmouseout=function(){highlightRow(this,'#fff');};for(i=0;i<aCells.length;i++){oNewRow.appendChild(aCells[i].cloneNode(true));switch(i){case 0:oNewRow.getElementsByTagName('td')[i].innerHTML=currentRow;break;case aCells.length-1:oNewRow.getElementsByTagName('td')[i].innerHTML=oNewRow.getElementsByTagName('td')[i].innerHTML.replace(/\[1\]/g,'\['+currentRow+'\]');break;default:var eNodeName=aCells[i].innerHTML.substring(aCells[i].innerHTML.indexOf('<')+1,aCells[i].innerHTML.indexOf(' '));eNodeName=eNodeName.toLowerCase();switch(eNodeName){case'input':aObjects=oNewRow.getElementsByTagName('td')[i].getElementsByTagName('input');if(aObjects){newID=aObjects[0].id.replace(/\[1\]/g,'\['+currentRow+'\]');aObjects[0].id=newID;aObjects[0].name=newID;attributes=elementAttributesNS(aObjects[0],'pm');if(typeof attributes.defaultvalue!="undefined"&&attributes.defaultvalue!=""){defaultValue=attributes.defaultvalue;}else{defaultValue="";}
+return newElem;};this.replaceHtml=function(el,html){var oldEl=typeof el==="string"?document.getElementById(el):el;if(this.determineBrowser()=="MSIE"){oldEl.innerHTML=html;return oldEl;}else{var newEl=oldEl.cloneNode(false);newEl.innerHTML=html;oldEl.parentNode.replaceChild(newEl,oldEl);return newEl;}};this.addGridRow=function(){this.oGrid=document.getElementById(this.sGridName);var i,aObjects;var defaultValue='';var n,a,x;var oRow=document.getElementById('firstRow_'+this.sGridName);var aCells=oRow.getElementsByTagName('td');var oNewRow=this.oGrid.insertRow(this.oGrid.rows.length-1);var currentRow=this.oGrid.rows.length-2;var newID,attributes,img2,gridType;oNewRow.onmouseover=function(){highlightRow(this,'#D9E8FF');};oNewRow.onmouseout=function(){highlightRow(this,'#fff');};for(i=0;i<aCells.length;i++){oNewRow.appendChild(aCells[i].cloneNode(true));switch(i){case 0:oNewRow.getElementsByTagName('td')[i].innerHTML=currentRow;break;case aCells.length-1:oNewRow.getElementsByTagName('td')[i].innerHTML=oNewRow.getElementsByTagName('td')[i].innerHTML.replace(/\[1\]/g,'\['+currentRow+'\]');break;default:var eNodeName=aCells[i].innerHTML.substring(aCells[i].innerHTML.indexOf('<')+1,aCells[i].innerHTML.indexOf(' '));eNodeName=eNodeName.toLowerCase();switch(eNodeName){case'input':aObjects=oNewRow.getElementsByTagName('td')[i].getElementsByTagName('input');if(aObjects){newID=aObjects[0].id.replace(/\[1\]/g,'\['+currentRow+'\]');aObjects[0].id=newID;aObjects[0].name=newID;attributes=elementAttributesNS(aObjects[0],'pm');if(typeof(attributes.defaultvalue)!="undefined"&&attributes.defaultvalue!=""){defaultValue=attributes.defaultvalue;}else{defaultValue="";}
 for(n=0;n<aObjects.length;n++){switch(aObjects[n].type){case'text':aObjects[n].className="module_app_input___gray";tags=oNewRow.getElementsByTagName('td')[i].getElementsByTagName('a');if(tags.length==2){img2=tags[1].innerHTML;var datePickerTriggerId=tags[1].id.replace(/\[1\]/g,'\['+currentRow+'\]');oNewRow.getElementsByTagName('td')[i].removeChild(tags[1]);var scriptTags=oNewRow.getElementsByTagName('td')[i].getElementsByTagName('script');oNewRow.getElementsByTagName('td')[i].removeChild(scriptTags[0]);if(tags[0].onclick){var onclickevn=new String(tags[0].onclick);eval('tags[0].onclick = '+onclickevn.replace(/\[1\]/g,'\['+currentRow+'\]')+';');}
 var a2=document.createElement('a');if(a2.style.setAttribute){var styleText="position:relative;top:0px;left:-19px;";a2.style.setAttribute("cssText",styleText);}
 else{var styleText="position:relative;top:0px;left:-22px;";a2.setAttribute("style",styleText);}
 a2.id=datePickerTriggerId;a2.innerHTML=img2;oNewRow.getElementsByTagName('td')[i].appendChild(a2);datePicker4("",newID,attributes.mask,attributes.start,attributes.end,attributes.time);aObjects[n].value=defaultValue;}else{if(_BROWSER.name=='msie'&&aObjects.length==1){var oNewOBJ=this.cloneElement(aObjects[n]);oNewOBJ.value=defaultValue;var parentGG=aObjects[n].parentNode;parentGG.removeChild(aObjects[n]);parentGG.appendChild(oNewOBJ);}else{if((attributes.gridtype)&&attributes.gridtype=="currency"){var attributesCurrency=elementAttributesNS(aObjects[n],"");aObjects[n].value=attributesCurrency.value.replace(/[.,0-9\s]/g,"");}else{aObjects[n].value=defaultValue;}}}
 var aObjectsScript=oNewRow.getElementsByTagName('td')[i].getElementsByTagName('script');var sObjectType=this.aFields[i-1].sType;if(aObjectsScript[0]!='undefined'&&sObjectType=='suggest'){if(this.determineBrowser()=="MSIE"){var firstNode=aCells[i];var firstScriptSuggest=firstNode.childNodes[2].innerHTML;var sScriptAdjustRow=firstScriptSuggest.replace(/\[1\]/g,'\['+currentRow+'\]');var elementTD=oNewRow.getElementsByTagName('td')[i];var elementLabel=elementTD.childNodes[0];var sNewLabelRow=elementLabel.getAttribute("id").replace(/\[1\]/g,'\['+currentRow+'\]');var elementHidden=elementTD.childNodes[1];var elementScript=elementTD.childNodes[2];var parentScript=elementScript.parentNode;var scriptElement=document.createElement("script");scriptElement.text=sScriptAdjustRow;parentScript.removeChild(elementScript);parentScript.appendChild(scriptElement);}else{var sObjScript=aObjectsScript[0].innerHTML;var sNewObjScript=sObjScript.replace(/\[1\]/g,"\["+currentRow+"\]");aObjectsScript[0].innerHTML=sNewObjScript;eval(aObjectsScript[0].innerHTML);}}
-break;case'checkbox':var attributeCheckBox=elementAttributesNS(aObjects[n],"");if(defaultValue==""||(typeof attributeCheckBox.falseValue!="undefined"&&defaultValue==attributeCheckBox.falseValue)||(typeof attributeCheckBox.falsevalue!="undefined"&&defaultValue==attributeCheckBox.falsevalue)){aObjects[n].checked=false;}else{aObjects[n].checked=true;}
-break;case'hidden':if((attributes.gridtype!='yesno'&&attributes.gridtype!='dropdown')||typeof attributes.gridtype=='undefined'){aObjects[n].value=defaultValue;newID=aObjects[n].id.replace(/\[1\]/g,'\['+currentRow+'\]');aObjects[n].id=newID;aObjects[n].name=newID;}
+break;case'checkbox':var attributeCheckBox=elementAttributesNS(aObjects[n],"");if(defaultValue==""||(typeof(attributeCheckBox.falseValue)!="undefined"&&defaultValue==attributeCheckBox.falseValue)||(typeof(attributeCheckBox.falsevalue)!="undefined"&&defaultValue==attributeCheckBox.falsevalue)){aObjects[n].checked=false;}else{aObjects[n].checked=true;}
+break;case'hidden':if((attributes.gridtype!="yesno"&&attributes.gridtype!="dropdown")||typeof(attributes.gridtype)=="undefined"){aObjects[n].value=defaultValue;newID=aObjects[n].id.replace(/\[1\]/g,'\['+currentRow+'\]');aObjects[n].id=newID;aObjects[n].name=newID;}
 break;case'button':if(aObjects[n].onclick){var onclickevn=new String(aObjects[n].onclick);eval('aObjects[n].onclick = '+onclickevn.replace(/\[1\]/g,'\['+currentRow+'\]')+';');}
 break;case"file":aObjects[n].value="";break;}}}
 aObjects=null;break;case'textarea':aObjects=oNewRow.getElementsByTagName('td')[i].getElementsByTagName('textarea');if(aObjects){aObjects[0].className="module_app_input___gray";newID=aObjects[0].id.replace(/\[1\]/g,'\['+currentRow+'\]');aObjects[0].id=newID;aObjects[0].name=newID;attributes=elementAttributesNS(aObjects[0],'pm');if(attributes.defaultvalue!=''&&typeof attributes.defaultvalue!='undefined'){defaultValue=attributes.defaultvalue;}else{defaultValue='';}
@@ -1369,12 +1373,7 @@ else{oNewSelect.setAttribute(aAttributes[a].name,aAttributes[a].value);}}}
 attributes=elementAttributesNS(aObjects[0],'pm');if(attributes.defaultvalue!=''&&typeof attributes.defaultvalue!='undefined'){defaultValue=attributes.defaultvalue;}else{defaultValue='';}
 if(attributes.gridtype!=''&&typeof attributes.gridtype!='undefined'){gridType=attributes.gridtype;}else{gridType='';}
 var aDependents=this.allDependentFields.split(',');sObject=this.getObjectName(newID);var sw=false;for(x=0;x<aDependents.length;x++){if(aDependents[x]==sObject)sw=true;}
-if(sw){oNewSelect.options.length=0;var oAux=document.createElement(aObjects[0].tagName);for(var j=0;j<aObjects[0].options.length;j++){if(aObjects[0].options[j].value==''){var oOption=document.createElement('OPTION');oOption.value=aObjects[0].options[j].value;oOption.text=aObjects[0].options[j].text;oAux.options.add(oOption);}}
-for(var r=0;r<oAux.options.length;r++){var xOption=document.createElement('OPTION');xOption.value=oAux.options[r].value;xOption.text=oAux.options[r].text;oNewSelect.options.add(xOption);}
-if(oNewSelect.options.length==0){oNewSelect.options[0]=new Option("","");}}else{if(defaultValue!=''){var oAux=document.createElement(aObjects[0].tagName);for(var j=0;j<aObjects[0].options.length;j++){var oOption=document.createElement('OPTION');oOption.value=aObjects[0].options[j].value;oOption.text=aObjects[0].options[j].text;if(aObjects[0].options[j].value===defaultValue){oOption.setAttribute('selected','selected');}
-oAux.options.add(oOption);}
-oNewSelect.innerHTML='';for(var r=0;r<oAux.options.length;r++){var xOption=document.createElement('OPTION');xOption.value=oAux.options[r].value;xOption.text=oAux.options[r].text;if(_BROWSER.name=='msie'){if(oAux.options[r].getAttribute('selected')!=''){xOption.setAttribute('selected','selected');}}else{if(oAux.options[r].getAttribute('selected')=='selected'){xOption.setAttribute('selected','selected');}}
-oNewSelect.options.add(xOption);}}else{var oAux=document.createElement(aObjects[0].tagName);for(var j=0;j<aObjects[0].options.length;j++){var oOption=document.createElement('OPTION');oOption.value=aObjects[0].options[j].value;oOption.text=aObjects[0].options[j].text;oNewSelect.options.add(oOption);}}}
+if(sw){oNewSelect.innerHTML="";if(oNewSelect.options.length==0){oNewSelect.options[0]=new Option("","");}}else{selectCloneOption.call(oNewSelect,aObjects[0],defaultValue);}
 var parentSelect=aObjects[0].parentNode;parentSelect.removeChild(aObjects[0]);parentSelect.appendChild(oNewSelect);}
 aObjects=oNewRow.getElementsByTagName('td')[i].getElementsByTagName('input');if(aObjects.length>0){newID=aObjects[0].id.replace(/\[1\]/g,'\['+currentRow+'\]');aObjects[0].id=newID;aObjects[0].name=newID;}
 aObjects=null;break;case'a':aObjects=oNewRow.getElementsByTagName('td')[i].getElementsByTagName('a');if(aObjects){newID=aObjects[0].id.replace(/\[1\]/g,'\['+currentRow+'\]');aObjects[0].id=newID;aObjects[0].name=newID;}
@@ -1391,7 +1390,7 @@ if(!exist){oAux.updateDepententFields();}}}}
 for(var i=0;i<this.aFields.length;i++){var fieldName='form['+sGridName+']['+currentRow+']['+this.aFields[i].sFieldName+']';if(this.aFields[i].sType=='suggest'){fieldName='form['+sGridName+']['+currentRow+']['+this.aFields[i].sFieldName+'_label]';}
 if(this.aFields[i].sType!='file'&&this.aFields[i].sType!='hidden'&&document.getElementById(fieldName).focus){document.getElementById(fieldName).focus();break;}}
 if(this.onaddrow){this.onaddrow(currentRow);}};this.deleteGridRow=function(sRow,bWithoutConfirm)
-{if(typeof bWithoutConfirm=="undefined"){bWithoutConfirm=false;}
+{if(typeof(bWithoutConfirm)=="undefined"){bWithoutConfirm=false;}
 if(this.oGrid.rows.length==3){new leimnud.module.app.alert().make({label:G_STRINGS.ID_MSG_NODELETE_GRID_ITEM});return false;}
 if(bWithoutConfirm){this.deleteRowWC(this,sRow);}else{new leimnud.module.app.confirm().make({label:G_STRINGS.ID_MSG_DELETE_GRID_ITEM,action:function()
 {this.deleteRowWC(this,sRow);}.extend(this)});}};this.deleteRowWC=function(oObj,aRow)
@@ -1400,8 +1399,7 @@ aObjects1[0].value=aObjects2[0].value;aObjects1[0].className=aObjects2[0].classN
 break;}}
 aObjects=oCell1.getElementsByTagName('div');if(aObjects.length>0){if(aObjects[0]){aObjects[0].id=aObjects[0].id.replace('/\['+(iRowAux-1)+'\]/g','\['+iRowAux+'\]');aObjects[0].name=aObjects[0].id.replace('/\['+(iRowAux-1)+'\]/g','\['+iRowAux+'\]');if(aObjects[0].onclick){sAux=new String(aObjects[0].onclick);eval('aObjects[0].onclick = '+sAux.replace('/\['+(iRowAux-1)+'\]/g','\['+iRowAux+'\]')+';');}}
 aObjects=oCell1.getElementsByTagName('a');if(aObjects){if(aObjects[0]){if(aObjects[0].onclick){sAux=new String(aObjects[0].onclick);eval('aObjects[0].onclick = '+sAux.replace('/\['+(iRowAux-1)+'\]/g','\['+iRowAux+'\]')+';');}}}}
-break;case'<selec':aObjects1=oCell1.getElementsByTagName('select');aObjects2=oCell2.getElementsByTagName('select');if(aObjects1&&aObjects2){var vValue=aObjects2[0].value;aObjects1[0].options.length=0;for(var j=0;j<aObjects2[0].options.length;j++){var optn=$dce("OPTION");optn.text=aObjects2[0].options[j].text;optn.value=aObjects2[0].options[j].value;aObjects1[0].options[j]=optn;}
-aObjects1[0].value=vValue;aObjects1[0].className=aObjects2[0].className;}
+break;case"<selec":aObjects1=oCell1.getElementsByTagName("select");aObjects2=oCell2.getElementsByTagName("select");if(aObjects1&&aObjects2){selectCloneOption.call(aObjects1[0],aObjects2[0],"");aObjects1[0].value=aObjects2[0].value;aObjects1[0].className=aObjects2[0].className;}
 break;case'<texta':aObjects1=oCell1.getElementsByTagName('textarea');aObjects2=oCell2.getElementsByTagName('textarea');if(aObjects1&&aObjects2){aObjects1[0].value=aObjects2[0].value;aObjects1[0].className=aObjects2[0].className;}
 break;default:if((oCell2.innerHTML.indexOf('changeValues')==111||oCell2.innerHTML.indexOf('changeValues')==115)){break;}
 if(oCell2.innerHTML.toLowerCase().indexOf('deletegridrow')==-1){oCell1.innerHTML=oCell2.innerHTML;}
@@ -1434,8 +1432,7 @@ if(oAux.fireEvent){oAux.fireEvent('onchange');}else{var evObj=document.createEve
 aObjects1[0].value=aObjects2[0].value;}
 aObjects=oCell1.getElementsByTagName('div');if(aObjects.length>0){if(aObjects[0]){aObjects[0].id=aObjects[0].id.replace(/\[1\]/g,'\['+(this.oGrid.rows.length-2)+'\]');aObjects[0].name=aObjects[0].id.replace(/\[1\]/g,'\['+(this.oGrid.rows.length-2)+'\]');if(aObjects[0].onclick){sAux=new String(aObjects[0].onclick);eval('aObjects[0].onclick = '+sAux.replace(/\[1\]/g,'\['+(this.oGrid.rows.length-2)+'\]')+';');}}
 aObjects=oCell1.getElementsByTagName('a');if(aObjects){if(aObjects[0]){if(aObjects[0].onclick){sAux=new String(aObjects[0].onclick);eval('aObjects[0].onclick = '+sAux.replace(/\[1\]/g,'\['+(this.oGrid.rows.length-2)+'\]')+';');}}}}
-break;case'<selec':aObjects1=oCell1.getElementsByTagName('select');aObjects2=oCell2.getElementsByTagName('select');if(aObjects1&&aObjects2){var vValue=aObjects2[0].value;aObjects1[0].options.length=0;for(var j=0;j<aObjects2[0].options.length;j++){var optn=$dce("OPTION");optn.text=aObjects2[0].options[j].text;optn.value=aObjects2[0].options[j].value;aObjects1[0].options[j]=optn;}
-aObjects1[0].value=vValue;}
+break;case"<selec":aObjects1=oCell1.getElementsByTagName("select");aObjects2=oCell2.getElementsByTagName("select");if(aObjects1&&aObjects2){selectCloneOption.call(aObjects1[0],aObjects2[0],"");aObjects1[0].value=aObjects2[0].value;}
 break;case'<texta':aObjects1=oCell1.getElementsByTagName('textarea');aObjects2=oCell2.getElementsByTagName('textarea');if(aObjects1&&aObjects2){aObjects1[0].value=aObjects2[0].value;}
 break;default:if((oCell2.innerHTML.indexOf('changeValues')==111||oCell2.innerHTML.indexOf('changeValues')==115)){break;}
 if(oCell2.innerHTML.toLowerCase().indexOf('deletegridrow')==-1){oCell1.innerHTML=oCell2.innerHTML;}
@@ -1448,6 +1445,10 @@ j++;}}
 if(this.aFunctions.length>0){for(i=0;i<this.aFunctions.length;i++){oAux=document.getElementById('form['+this.sGridName+'][1]['+this.aFunctions[i].sFieldName+']');if(oAux){switch(this.aFunctions[i].sFunction){case'sum':this.sum(false,oAux);break;case'avg':this.avg(false,oAux);break;}}}}
 if(this.ondeleterow){this.ondeleterow();}};};function deleteRowOnDynaform(grid,sRow){var oRPC=new leimnud.module.rpc.xmlhttp({url:'../gulliver/genericAjax',args:'request=deleteGridRowOnDynaform&gridname='+grid.sGridName+'&rowpos='+sRow+'&formID='+grid.form.id});oRPC.callback=function(rpc){if(oPanel)
 oPanel.loader.hide();scs=rpc.xmlhttp.responseText.extractScript();scs.evalScript();if(typeof(oDebuggerPanel)!='undefined'&&oDebuggerPanel!=null){oDebuggerPanel.clearContent();oDebuggerPanel.loader.show();var oRPC=new leimnud.module.rpc.xmlhttp({url:'cases_Ajax',args:'action=showdebug'});oRPC.callback=function(rpc){oDebuggerPanel.loader.hide();var scs=rpc.xmlhttp.responseText.extractScript();oDebuggerPanel.addContent(rpc.xmlhttp.responseText);scs.evalScript();}.extend(this);oRPC.make();}}.extend(this);oRPC.make();}
+function selectCloneOption(selectOrigin,defaultValue)
+{var arrayOption=[];var arrayOptGroup=[];var arrayOptGroupOption=[];var arrayAux=[];var optGroupAux;var optionAux;var i1=0;var i2=0;var i3=0;var swSelected=0;this.innerHTML="";for(i1=0;i1<=selectOrigin.options.length-1;i1++){if(selectOrigin.options[i1].parentNode.nodeName.toLowerCase()!="optgroup"){arrayOption.push(["option",selectOrigin.options[i1].value,selectOrigin.options[i1].text]);}else{if(typeof(arrayAux[selectOrigin.options[i1].parentNode.label])=="undefined"){arrayAux[selectOrigin.options[i1].parentNode.label]=1;arrayOption.push(["optgroup",1,selectOrigin.options[i1].parentNode.label]);}}}
+for(i1=0;i1<=arrayOption.length-1;i1++){if(arrayOption[i1][0]=="option"){optionAux=document.createElement("option");this.appendChild(optionAux);optionAux.value=arrayOption[i1][1];optionAux.text=arrayOption[i1][2];if(swSelected==0&&defaultValue!=""&&arrayOption[i1][1]==defaultValue){optionAux.setAttribute("selected","selected");swSelected=1;}}else{arrayOptGroup=selectOrigin.getElementsByTagName("optgroup");for(i2=0;i2<=arrayOptGroup.length-1;i2++){if(arrayOptGroup[i2].label==arrayOption[i1][2]){arrayOptGroupOption=arrayOptGroup[i2].getElementsByTagName("option");if(arrayOptGroupOption.length>0){optGroupAux=document.createElement("optgroup");this.appendChild(optGroupAux);optGroupAux.label=arrayOptGroup[i2].label;for(i3=0;i3<=arrayOptGroupOption.length-1;i3++){optionAux=document.createElement("option");optGroupAux.appendChild(optionAux);optionAux.value=arrayOptGroupOption[i3].value;optionAux.text=arrayOptGroupOption[i3].text;if(swSelected==0&&defaultValue!=""&&arrayOptGroupOption[i3].value==defaultValue){optionAux.setAttribute("selected","selected");swSelected=1;}}}}}}}
+if(this.options.length==0){this.options[0]=new Option("","");}}
 var __lastMasks__={};Calendar=function(){function bm(a){typeof a=="string"&&(a=document.getElementById(a));return a}function bk(a,b,c){for(c=0;c<a.length;++c)b(a[c])}function bj(){var a=document.documentElement,b=document.body;return{x:a.scrollLeft||b.scrollLeft,y:a.scrollTop||b.scrollTop,w:a.clientWidth||window.innerWidth||b.clientWidth,h:a.clientHeight||window.innerHeight||b.clientHeight}}function bi(a){var b=0,c=0,d=/^div$/i.test(a.tagName),e,f;d&&a.scrollLeft&&(b=a.scrollLeft),d&&a.scrollTop&&(c=a.scrollTop),e={x:a.offsetLeft-b,y:a.offsetTop-c},a.offsetParent&&(f=bi(a.offsetParent),e.x+=f.x,e.y+=f.y);return e}function bh(a,b){var c=e?a.clientX+document.body.scrollLeft:a.pageX,d=e?a.clientY+document.body.scrollTop:a.pageY;b&&(c-=b.x,d-=b.y);return{x:c,y:d}}function bg(a,b){var c=a.style;b!=null&&(c.display=b?"":"none");return c.display!="none"}function bf(a,b){b===""?e?a.style.filter="":a.style.opacity="":b!=null?e?a.style.filter="alpha(opacity="+b*100+")":a.style.opacity=b:e?/alpha\(opacity=([0-9.])+\)/.test(a.style.opacity)&&(b=parseFloat(RegExp.$1)/100):b=parseFloat(a.style.opacity);return b}function bd(a,b,c){function h(){var b=a.len;a.onUpdate(c/b,d),c==b&&g(),++c}function g(){b&&(clearInterval(b),b=null),a.onStop(c/a.len,d)}function f(){b&&g(),c=0,b=setInterval(h,1e3/a.fps)}function d(a,b,c,d){return d?c+a*(b-c):b+a*(c-b)}a=U(a,{fps:50,len:15,onUpdate:bl,onStop:bl}),e&&(a.len=Math.round(a.len/2)),f();return{start:f,stop:g,update:h,args:a,map:d}}function bc(a,b){if(!b(a))for(var c=a.firstChild;c;c=c.nextSibling)c.nodeType==1&&bc(c,b)}function bb(a,b){var c=ba(arguments,2);return b==undefined?function(){return a.apply(this,c.concat(ba(arguments)))}:function(){return a.apply(b,c.concat(ba(arguments)))}}function ba(a,b){b==null&&(b=0);var c,d,e;try{c=Array.prototype.slice.call(a,b)}catch(f){c=Array(a.length-b);for(d=b,e=0;d<a.length;++d,++e)c[e]=a[d]}return c}function _(a,b,c){var d=null;document.createElementNS?d=document.createElementNS("http://www.w3.org/1999/xhtml",a):d=document.createElement(a),b&&(d.className=b),c&&c.appendChild(d);return d}function $(a,b,c){if(b instanceof Array)for(var d=b.length;--d>=0;)$(a,b[d],c);else Y(b,c,a?c:null);return a}function Z(a,b){return Y(a,b,b)}function Y(a,b,c){if(a){var d=a.className.replace(/^\s+|\s+$/,"").split(/\x20/),e=[],f;for(f=d.length;f>0;)d[--f]!=b&&e.push(d[f]);c&&e.push(c),a.className=e.join(" ")}return c}function X(a){a=a||window.event,e?(a.cancelBubble=!0,a.returnValue=!1):(a.preventDefault(),a.stopPropagation());return!1}function W(a,b,c,d){if(a instanceof Array)for(var f=a.length;--f>=0;)W(a[f],b,c);else if(typeof b=="object")for(var f in b)b.hasOwnProperty(f)&&W(a,f,b[f],c);else a.removeEventListener?a.removeEventListener(b,c,e?!0:!!d):a.detachEvent?a.detachEvent("on"+b,c):a["on"+b]=null}function V(a,b,c,d){if(a instanceof Array)for(var f=a.length;--f>=0;)V(a[f],b,c,d);else if(typeof b=="object")for(var f in b)b.hasOwnProperty(f)&&V(a,f,b[f],c);else a.addEventListener?a.addEventListener(b,c,e?!0:!!d):a.attachEvent?a.attachEvent("on"+b,c):a["on"+b]=c}function U(a,b,c,d){d={};for(c in b)b.hasOwnProperty(c)&&(d[c]=b[c]);for(c in a)a.hasOwnProperty(c)&&(d[c]=a[c]);return d}function T(a){if(/\S/.test(a)){a=a.toLowerCase();function b(b){for(var c=b.length;--c>=0;)if(b[c].toLowerCase().indexOf(a)==0)return c+1}return b(L("smn"))||b(L("mn"))}}function S(a){if(a){if(typeof a=="number")return P(a);if(!(a instanceof Date)){var b=a.split(/-/);return new Date(parseInt(b[0],10),parseInt(b[1],10)-1,parseInt(b[2],10),12,0,0,0)}}return a}function R(a,b){var c=a.getMonth(),d=a.getDate(),e=a.getFullYear(),f=M(a),g=a.getDay(),h=a.getHours(),i=h>=12,j=i?h-12:h,k=N(a),l=a.getMinutes(),m=a.getSeconds(),n=/%./g,o;j===0&&(j=12),o={"%a":L("sdn")[g],"%A":L("dn")[g],"%b":L("smn")[c],"%B":L("mn")[c],"%C":1+Math.floor(e/100),"%d":d<10?"0"+d:d,"%e":d,"%H":h<10?"0"+h:h,"%I":j<10?"0"+j:j,"%j":k<10?"00"+k:k<100?"0"+k:k,"%k":h,"%l":j,"%m":c<9?"0"+(1+c):1+c,"%o":1+c,"%M":l<10?"0"+l:l,"%n":"\n","%p":i?"PM":"AM","%P":i?"pm":"am","%s":Math.floor(a.getTime()/1e3),"%S":m<10?"0"+m:m,"%t":"\t","%U":f<10?"0"+f:f,"%W":f<10?"0"+f:f,"%V":f<10?"0"+f:f,"%u":g+1,"%w":g,"%y":(""+e).substr(2,2),"%Y":e,"%%":"%"};return b.replace(n,function(a){return o.hasOwnProperty(a)?o[a]:a})}function Q(a,b,c){var d=a.getFullYear(),e=a.getMonth(),f=a.getDate(),g=b.getFullYear(),h=b.getMonth(),i=b.getDate();return d<g?-3:d>g?3:e<h?-2:e>h?2:c?0:f<i?-1:f>i?1:0}function P(a,b,c,d,e){if(!(a instanceof Date)){a=parseInt(a,10);var f=Math.floor(a/1e4);a=a%1e4;var g=Math.floor(a/100);a=a%100,a=new Date(f,g-1,a,b==null?12:b,c==null?0:c,d==null?0:d,e==null?0:e)}return a}function O(a){if(a instanceof Date)return 1e4*a.getFullYear()+100*(a.getMonth()+1)+a.getDate();if(typeof a=="string")return parseInt(a,10);return a}function N(a){a=new Date(a.getFullYear(),a.getMonth(),a.getDate(),12,0,0);var b=new Date(a.getFullYear(),0,1,12,0,0),c=a-b;return Math.floor(c/864e5)}function M(a){a=new Date(a.getFullYear(),a.getMonth(),a.getDate(),12,0,0);var b=a.getDay();a.setDate(a.getDate()-(b+6)%7+3);var c=a.valueOf();a.setMonth(0),a.setDate(4);return Math.round((c-a.valueOf())/6048e5)+1}function L(a,b){var c=i.__.data[a];b&&typeof c=="string"&&(c=K(c,b));return c}function K(a,b){return a.replace(/\$\{([^:\}]+)(:[^\}]+)?\}/g,function(a,c,d){var e=b[c],f;d&&(f=d.substr(1).split(/\s*\|\s*/),e=(e>=f.length?f[f.length-1]:f[e]).replace(/##?/g,function(a){return a.length==2?"#":e}));return e})}function J(b){if(!this._menuAnim){b=b||window.event;var c=b.target||b.srcElement,d=c.getAttribute("dyc-btn"),e=b.keyCode,f=b.charCode||e,g=H[e];if("year"==d&&e==13){var h=new Date(this.date);h.setDate(1),h.setFullYear(this._getInputYear()),this.moveTo(h,!0),z(this,!1);return X(b)}if(this._menuVisible){if(e==27){z(this,!1);return X(b)}}else{b.ctrlKey||(g=null),g==null&&!b.ctrlKey&&(g=I[e]),e==36&&(g=0);if(g!=null){y(this,g);return X(b)}f=String.fromCharCode(f).toLowerCase();var i=this.els.yearInput,j=this.selection;if(f==" "){z(this,!0),this.focus(),i.focus(),i.select();return X(b)}if(f>="0"&&f<="9"){z(this,!0),this.focus(),i.value=f,i.focus();return X(b)}var k=L("mn"),l=b.shiftKey?-1:this.date.getMonth(),m=0,n;while(++m<12){n=k[(l+m)%12].toLowerCase();if(n.indexOf(f)==0){var h=new Date(this.date);h.setDate(1),h.setMonth((l+m)%12),this.moveTo(h,!0);return X(b)}}if(e>=37&&e<=40){var h=this._lastHoverDate;if(!h&&!j.isEmpty()){h=e<39?j.getFirstDate():j.getLastDate();if(h<this._firstDateVisible||h>this._lastDateVisible)h=null}if(!h)h=e<39?this._lastDateVisible:this._firstDateVisible;else{var o=h;h=P(h);var l=100;while(l-->0){switch(e){case 37:h.setDate(h.getDate()-1);break;case 38:h.setDate(h.getDate()-7);break;case 39:h.setDate(h.getDate()+1);break;case 40:h.setDate(h.getDate()+7)}if(!this.isDisabled(h))break}h=O(h),(h<this._firstDateVisible||h>this._lastDateVisible)&&this.moveTo(h)}Y(this._getDateDiv(o),Z(this._getDateDiv(h),"DynarchCalendar-hover-date")),this._lastHoverDate=h;return X(b)}if(e==13&&this._lastHoverDate){j.type==a.SEL_MULTIPLE&&(b.shiftKey||b.ctrlKey)?(b.shiftKey&&this._selRangeStart&&(j.clear(!0),j.selectRange(this._selRangeStart,this._lastHoverDate)),b.ctrlKey&&j.set(this._selRangeStart=this._lastHoverDate,!0)):j.reset(this._selRangeStart=this._lastHoverDate);return X(b)}e==27&&!this.args.cont&&this.hide()}}}function G(){this.refresh();var a=this.inputField,b=this.selection;if(a){var __lastMask__=(typeof(__lastMasks__[a.id.replace(/[\[\]]/g,'_')])!='undefined'?__lastMasks__[a.id.replace(/[\[\]]/g,'_')]:false);var c=b.print(__lastMask__||this.dateFormat);/input|textarea/i.test(a.tagName)?a.value=c:a.innerHTML=c}this.callHooks("onSelect",this,b)}function F(a){a=a||window.event;var b=C(a);if(b){var c=b.getAttribute("dyc-btn"),d=b.getAttribute("dyc-type"),e=a.wheelDelta?a.wheelDelta/120:-a.detail/3;e=e<0?-1:e>0?1:0,this.args.reverseWheel&&(e=-e);if(/^(time-(hour|min))/.test(d)){switch(RegExp.$1){case"time-hour":this.setHours(this.getHours()+e);break;case"time-min":this.setMinutes(this.getMinutes()+this.args.minuteStep*e)}X(a)}else/Y/i.test(c)&&(e*=2),y(this,-e),X(a)}}function E(a,b){b=b||window.event;var c=C(b);if(c){var d=c.getAttribute("dyc-type");if(d&&!c.getAttribute("disabled"))if(!a||!this._bodyAnim||d!="date"){var e=c.getAttribute("dyc-cls");e=e?D(e,0):"DynarchCalendar-hover-"+d,(d!="date"||this.selection.type)&&$(a,c,e),d=="date"&&($(a,c.parentNode.parentNode,"DynarchCalendar-hover-week"),this._showTooltip(c.getAttribute("dyc-date"))),/^time-hour/.test(d)&&$(a,this.els.timeHour,"DynarchCalendar-hover-time"),/^time-min/.test(d)&&$(a,this.els.timeMinute,"DynarchCalendar-hover-time"),Y(this._getDateDiv(this._lastHoverDate),"DynarchCalendar-hover-date"),this._lastHoverDate=null}}a||this._showTooltip()}function D(a,b){return"DynarchCalendar-"+a.split(/,/)[b]}function C(a){var b=a.target||a.srcElement,c=b;while(b&&b.getAttribute&&!b.getAttribute("dyc-type"))b=b.parentNode;return b.getAttribute&&b||c}function B(a){a=a||window.event;var b=this.els.topCont.style,c=bh(a,this._mouseDiff);b.left=c.x+"px",b.top=c.y+"px"}function A(b,c){c=c||window.event;var d=C(c);if(d&&!d.getAttribute("disabled")){var f=d.getAttribute("dyc-btn"),g=d.getAttribute("dyc-type"),h=d.getAttribute("dyc-date"),i=this.selection,j,k={mouseover:X,mousemove:X,mouseup:function(a){var b=d.getAttribute("dyc-cls");b&&Y(d,D(b,1)),clearTimeout(j),W(document,k,!0),k=null}};if(b){setTimeout(bb(this.focus,this),1);var l=d.getAttribute("dyc-cls");l&&Z(d,D(l,1));if("menu"==f)this.toggleMenu();else if(d&&/^[+-][MY]$/.test(f))if(y(this,f)){var m=bb(function(){y(this,f,!0)?j=setTimeout(m,40):(k.mouseup(),y(this,f))},this);j=setTimeout(m,350),V(document,k,!0)}else k.mouseup();else if("year"==f)this.els.yearInput.focus(),this.els.yearInput.select();else if(g=="time-am")V(document,k,!0);else if(/^time/.test(g)){var m=bb(function(a){w.call(this,a),j=setTimeout(m,100)},this,g);w.call(this,g),j=setTimeout(m,350),V(document,k,!0)}else h&&i.type&&(i.type==a.SEL_MULTIPLE?c.shiftKey&&this._selRangeStart?i.selectRange(this._selRangeStart,h):(!c.ctrlKey&&!i.isSelected(h)&&i.clear(!0),i.set(h,!0),this._selRangeStart=h):(i.set(h),this.moveTo(P(h),2)),d=this._getDateDiv(h),E.call(this,!0,{target:d})),V(document,k,!0);e&&k&&/dbl/i.test(c.type)&&k.mouseup(),!this.args.fixed&&/^(DynarchCalendar-(topBar|bottomBar|weekend|weekNumber|menu(-sep)?))?$/.test(d.className)&&!this.args.cont&&(k.mousemove=bb(B,this),this._mouseDiff=bh(c,bi(this.els.topCont)),V(document,k,!0))}else if("today"==f)!this._menuVisible&&i.type==a.SEL_SINGLE&&i.set(new Date),this.moveTo(new Date,!0),z(this,!1);else if(/^m([0-9]+)/.test(f)){var h=new Date(this.date);h.setDate(1),h.setMonth(RegExp.$1),h.setFullYear(this._getInputYear()),this.moveTo(h,!0),z(this,!1)}else g=="time-am"&&this.setHours(this.getHours()+12);e||X(c)}}function z(a,b){a._menuVisible=b,$(b,a.els.title,"DynarchCalendar-pressed-title");var c=a.els.menu;f&&(c.style.height=a.els.main.offsetHeight+"px");if(!a.args.animation)bg(c,b),a.focused&&a.focus();else{a._menuAnim&&a._menuAnim.stop();var d=a.els.main.offsetHeight;f&&(c.style.width=a.els.topBar.offsetWidth+"px"),b&&(c.firstChild.style.marginTop=-d+"px",a.args.opacity>0&&bf(c,0),bg(c,!0)),a._menuAnim=bd({onUpdate:function(e,f){c.firstChild.style.marginTop=f(be.accel_b(e),-d,0,!b)+"px",a.args.opacity>0&&bf(c,f(be.accel_b(e),0,.85,!b))},onStop:function(){a.args.opacity>0&&bf(c,.85),c.firstChild.style.marginTop="",a._menuAnim=null,b||(bg(c,!1),a.focused&&a.focus())}})}}function y(a,b,c){this._bodyAnim&&this._bodyAnim.stop();var d;if(b!=0){d=new Date(a.date),d.setDate(1);switch(b){case"-Y":case-2:d.setFullYear(d.getFullYear()-1);break;case"+Y":case 2:d.setFullYear(d.getFullYear()+1);break;case"-M":case-1:d.setMonth(d.getMonth()-1);break;case"+M":case 1:d.setMonth(d.getMonth()+1)}}else d=new Date;return a.moveTo(d,!c)}function w(a){switch(a){case"time-hour+":this.setHours(this.getHours()+1);break;case"time-hour-":this.setHours(this.getHours()-1);break;case"time-min+":this.setMinutes(this.getMinutes()+this.args.minuteStep);break;case"time-min-":this.setMinutes(this.getMinutes()-this.args.minuteStep);break;default:return}}function v(){this._bluringTimeout=setTimeout(bb(u,this),50)}function u(){this.focused=!1,Y(this.els.main,"DynarchCalendar-focused"),this._menuVisible&&z(this,!1),this.args.cont||this.hide(),this.callHooks("onBlur",this)}function t(){this._bluringTimeout&&clearTimeout(this._bluringTimeout),this.focused=!0,Z(this.els.main,"DynarchCalendar-focused"),this.callHooks("onFocus",this)}function s(a){var b=_("div"),c=a.els={},d={mousedown:bb(A,a,!0),mouseup:bb(A,a,!1),mouseover:bb(E,a,!0),mouseout:bb(E,a,!1),keypress:bb(J,a)};a.args.noScroll||(d[g?"DOMMouseScroll":"mousewheel"]=bb(F,a)),e&&(d.dblclick=d.mousedown,d.keydown=d.keypress),b.innerHTML=m(a),bc(b.firstChild,function(a){var b=r[a.className];b&&(c[b]=a),e&&a.setAttribute("unselectable","on")}),V(c.main,d),V([c.focusLink,c.yearInput],a._focusEvents={focus:bb(t,a),blur:bb(v,a)}),a.moveTo(a.date,!1),a.setTime(null,!0);return c.topCont}function q(a){function d(){c.showTime&&(b.push("<td>"),p(a,b),b.push("</td>"))}var b=[],c=a.args;b.push("<table",j," style='width:100%'><tr>"),c.timePos=="left"&&d(),c.bottomBar&&(b.push("<td>"),b.push("<table",j,"><tr><td>","<div dyc-btn='today' dyc-cls='hover-bottomBar-today,pressed-bottomBar-today' dyc-type='bottomBar-today' ","class='DynarchCalendar-bottomBar-today'>",L("today"),"</div>","</td></tr></table>"),b.push("</td>")),c.timePos=="right"&&d(),b.push("</tr></table>");return b.join("")}function p(a,b){b.push("<table class='DynarchCalendar-time'"+j+"><tr>","<td rowspan='2'><div dyc-type='time-hour' dyc-cls='hover-time,pressed-time' class='DynarchCalendar-time-hour'></div></td>","<td dyc-type='time-hour+' dyc-cls='hover-time,pressed-time' class='DynarchCalendar-time-up'></td>","<td rowspan='2' class='DynarchCalendar-time-sep'></td>","<td rowspan='2'><div dyc-type='time-min' dyc-cls='hover-time,pressed-time' class='DynarchCalendar-time-minute'></div></td>","<td dyc-type='time-min+' dyc-cls='hover-time,pressed-time' class='DynarchCalendar-time-up'></td>"),a.args.showTime==12&&b.push("<td rowspan='2' class='DynarchCalendar-time-sep'></td>","<td rowspan='2'><div class='DynarchCalendar-time-am' dyc-type='time-am' dyc-cls='hover-time,pressed-time'></div></td>"),b.push("</tr><tr>","<td dyc-type='time-hour-' dyc-cls='hover-time,pressed-time' class='DynarchCalendar-time-down'></td>","<td dyc-type='time-min-' dyc-cls='hover-time,pressed-time' class='DynarchCalendar-time-down'></td>","</tr></table>")}function o(a){var b=["<table height='100%'",j,"><tr><td>","<table style='margin-top: 1.5em'",j,">","<tr><td colspan='3'><input dyc-btn='year' class='DynarchCalendar-menu-year' size='6' value='",a.date.getFullYear(),"' /></td></tr>","<tr><td><div dyc-type='menubtn' dyc-cls='hover-navBtn,pressed-navBtn' dyc-btn='today'>",L("goToday"),"</div></td></tr>","</table>","<p class='DynarchCalendar-menu-sep'>&nbsp;</p>","<table class='DynarchCalendar-menu-mtable'",j,">"],c=L("smn"),d=0,e=b.length,f;while(d<12){b[e++]="<tr>";for(f=4;--f>0;)b[e++]="<td><div dyc-type='menubtn' dyc-cls='hover-navBtn,pressed-navBtn' dyc-btn='m"+d+"' class='DynarchCalendar-menu-month'>"+c[d++]+"</div></td>";b[e++]="</tr>"}b[e++]="</table></td></tr></table>";return b.join("")}function n(a){return"<div unselectable='on'>"+R(a.date,a.args.titleFormat)+"</div>"}function m(a){var b=["<table class='DynarchCalendar-topCont'",j,"><tr><td>","<div class='DynarchCalendar'>",e?"<a class='DynarchCalendar-focusLink' href='#'></a>":"<button class='DynarchCalendar-focusLink'></button>","<div class='DynarchCalendar-topBar'>","<div dyc-type='nav' dyc-btn='-Y' dyc-cls='hover-navBtn,pressed-navBtn' ","class='DynarchCalendar-navBtn DynarchCalendar-prevYear'><div></div></div>","<div dyc-type='nav' dyc-btn='+Y' dyc-cls='hover-navBtn,pressed-navBtn' ","class='DynarchCalendar-navBtn DynarchCalendar-nextYear'><div></div></div>","<div dyc-type='nav' dyc-btn='-M' dyc-cls='hover-navBtn,pressed-navBtn' ","class='DynarchCalendar-navBtn DynarchCalendar-prevMonth'><div></div></div>","<div dyc-type='nav' dyc-btn='+M' dyc-cls='hover-navBtn,pressed-navBtn' ","class='DynarchCalendar-navBtn DynarchCalendar-nextMonth'><div></div></div>","<table class='DynarchCalendar-titleCont'",j,"><tr><td>","<div dyc-type='title' dyc-btn='menu' dyc-cls='hover-title,pressed-title' class='DynarchCalendar-title'>",n(a),"</div></td></tr></table>","<div class='DynarchCalendar-dayNames'>",k(a),"</div>","</div>","<div class='DynarchCalendar-body'></div>"];(a.args.bottomBar||a.args.showTime)&&b.push("<div class='DynarchCalendar-bottomBar'>",q(a),"</div>"),b.push("<div class='DynarchCalendar-menu' style='display: none'>",o(a),"</div>","<div class='DynarchCalendar-tooltip'></div>","</div>","</td></tr></table>");return b.join("")}function l(a,b,c){b=b||a.date,c=c||a.fdow,b=new Date(b.getFullYear(),b.getMonth(),b.getDate(),12,0,0,0);var d=b.getMonth(),e=[],f=0,g=a.args.weekNumbers;b.setDate(1);var h=(b.getDay()-c)%7;h<0&&(h+=7),b.setDate(0-h),b.setDate(b.getDate()+1);var i=new Date,k=i.getDate(),l=i.getMonth(),m=i.getFullYear();e[f++]="<table class='DynarchCalendar-bodyTable'"+j+">";for(var n=0;n<6;++n){e[f++]="<tr class='DynarchCalendar-week",n==0&&(e[f++]=" DynarchCalendar-first-row"),n==5&&(e[f++]=" DynarchCalendar-last-row"),e[f++]="'>",g&&(e[f++]="<td class='DynarchCalendar-first-col'><div class='DynarchCalendar-weekNumber'>"+M(b)+"</div></td>");for(var o=0;o<7;++o){var p=b.getDate(),q=b.getMonth(),r=b.getFullYear(),s=1e4*r+100*(q+1)+p,t=a.selection.isSelected(s),u=a.isDisabled(b);e[f++]="<td class='",o==0&&!g&&(e[f++]=" DynarchCalendar-first-col"),o==0&&n==0&&(a._firstDateVisible=s),o==6&&(e[f++]=" DynarchCalendar-last-col",n==5&&(a._lastDateVisible=s)),t&&(e[f++]=" DynarchCalendar-td-selected"),e[f++]="'><div dyc-type='date' unselectable='on' dyc-date='"+s+"' ",u&&(e[f++]="disabled='1' "),e[f++]="class='DynarchCalendar-day",L("weekend").indexOf(b.getDay())>=0&&(e[f++]=" DynarchCalendar-weekend"),q!=d&&(e[f++]=" DynarchCalendar-day-othermonth"),p==k&&q==l&&r==m&&(e[f++]=" DynarchCalendar-day-today"),u&&(e[f++]=" DynarchCalendar-day-disabled"),t&&(e[f++]=" DynarchCalendar-day-selected"),u=a.args.dateInfo(b),u&&u.klass&&(e[f++]=" "+u.klass),e[f++]="'>"+p+"</div></td>",b=new Date(r,q,p+1,12,0,0,0)}e[f++]="</tr>"}e[f++]="</table>";return e.join("")}function k(a){var b=["<table",j,"><tr>"],c=0;a.args.weekNumbers&&b.push("<td><div class='DynarchCalendar-weekNumber'>",L("wk"),"</div></td>");while(c<7){var d=(c+++a.fdow)%7;b.push("<td><div",L("weekend").indexOf(d)>=0?" class='DynarchCalendar-weekend'>":">",L("sdn")[d],"</div></td>")}b.push("</tr></table>");return b.join("")}function a(b){b=b||{},this.args=b=U(b,{animation:!f,cont:null,bottomBar:!0,date:!0,fdow:L("fdow"),min:null,max:null,reverseWheel:!1,selection:[],selectionType:a.SEL_SINGLE,weekNumbers:!1,align:"Bl/ / /T/r",inputField:null,trigger:null,dateFormat:"%Y-%m-%d",fixed:!1,opacity:e?1:3,titleFormat:"%b %Y",showTime:!1,timePos:"right",time:!0,minuteStep:5,noScroll:!1,disabled:bl,checkRange:!1,dateInfo:bl,onChange:bl,onSelect:bl,onTimeChange:bl,onFocus:bl,onBlur:bl}),this.handlers={};var c=this,d=new Date;b.min=S(b.min),b.max=S(b.max),b.date===!0&&(b.date=d),b.time===!0&&(b.time=d.getHours()*100+Math.floor(d.getMinutes()/b.minuteStep)*b.minuteStep),this.date=S(b.date),this.time=b.time,this.fdow=b.fdow,bk("onChange onSelect onTimeChange onFocus onBlur".split(/\s+/),function(a){var d=b[a];d instanceof Array||(d=[d]),c.handlers[a]=d}),this.selection=new a.Selection(b.selection,b.selectionType,G,this);var g=s(this);b.cont&&bm(b.cont).appendChild(g),b.trigger&&this.manageFields(b.trigger,b.inputField,b.dateFormat)}var b=navigator.userAgent,c=/opera/i.test(b),d=/Konqueror|Safari|KHTML/i.test(b),e=/msie/i.test(b)&&!c&&!/mac_powerpc/i.test(b),f=e&&/msie 6/i.test(b),g=/gecko/i.test(b)&&!d&&!c&&!e,h=a.prototype,i=a.I18N={};a.SEL_NONE=0,a.SEL_SINGLE=1,a.SEL_MULTIPLE=2,a.SEL_WEEK=3,a.dateToInt=O,a.intToDate=P,a.printDate=R,a.formatString=K,a.i18n=L,a.LANG=function(a,b,c){i.__=i[a]={name:b,data:c}},a.setup=function(b){return new a(b)},h.moveTo=function(a,b){var c=this;a=S(a);var d=Q(a,c.date,!0),e,f=c.args,g=f.min&&Q(a,f.min),h=f.max&&Q(a,f.max);f.animation||(b=!1),$(g!=null&&g<=1,[c.els.navPrevMonth,c.els.navPrevYear],"DynarchCalendar-navDisabled"),$(h!=null&&h>=-1,[c.els.navNextMonth,c.els.navNextYear],"DynarchCalendar-navDisabled"),g<-1&&(a=f.min,e=1,d=0),h>1&&(a=f.max,e=2,d=0),c.date=a,c.refresh(!!b),c.callHooks("onChange",c,a,b);if(b&&(d!=0||b!=2)){c._bodyAnim&&c._bodyAnim.stop();var i=c.els.body,j=_("div","DynarchCalendar-animBody-"+x[d],i),k=i.firstChild,m=bf(k)||.7,n=e?be.brakes:d==0?be.shake:be.accel_ab2,o=d*d>4,p=o?k.offsetTop:k.offsetLeft,q=j.style,r=o?i.offsetHeight:i.offsetWidth;d<0?r+=p:d>0?r=p-r:(r=Math.round(r/7),e==2&&(r=-r));if(!e&&d!=0){var s=j.cloneNode(!0),t=s.style,u=2*r;s.appendChild(k.cloneNode(!0)),t[o?"marginTop":"marginLeft"]=r+"px",i.appendChild(s)}k.style.visibility="hidden",j.innerHTML=l(c),c._bodyAnim=bd({onUpdate:function(a,b){var f=n(a);if(s)var g=b(f,r,u)+"px";if(e)q[o?"marginTop":"marginLeft"]=b(f,r,0)+"px";else{if(o||d==0)q.marginTop=b(d==0?n(a*a):f,0,r)+"px",d!=0&&(t.marginTop=g);if(!o||d==0)q.marginLeft=b(f,0,r)+"px",d!=0&&(t.marginLeft=g)}c.args.opacity>2&&s&&(bf(s,1-f),bf(j,f))},onStop:function(b){i.innerHTML=l(c,a),c._bodyAnim=null}})}c._lastHoverDate=null;return g>=-1&&h<=1},h.isDisabled=function(a){var b=this.args;return b.min&&Q(a,b.min)<0||b.max&&Q(a,b.max)>0||b.disabled(a)},h.toggleMenu=function(){z(this,!this._menuVisible)},h.refresh=function(a){var b=this.els;a||(b.body.innerHTML=l(this)),b.title.innerHTML=n(this),b.yearInput.value=this.date.getFullYear()},h.redraw=function(){var a=this,b=a.els;a.refresh(),b.dayNames.innerHTML=k(a),b.menu.innerHTML=o(a),b.bottomBar&&(b.bottomBar.innerHTML=q(a)),bc(b.topCont,function(c){var d=r[c.className];d&&(b[d]=c),c.className=="DynarchCalendar-menu-year"?(V(c,a._focusEvents),b.yearInput=c):e&&c.setAttribute("unselectable","on")}),a.setTime(null,!0)},h.setLanguage=function(b){var c=a.setLanguage(b);c&&(this.fdow=c.data.fdow,this.redraw())},a.setLanguage=function(a){var b=i[a];b&&(i.__=b);return b},h.focus=function(){try{this.els[this._menuVisible?"yearInput":"focusLink"].focus()}catch(a){}t.call(this)},h.blur=function(){this.els.focusLink.blur(),this.els.yearInput.blur(),u.call(this)},h.showAt=function(a,b,c){this._showAnim&&this._showAnim.stop(),c=c&&this.args.animation;var d=this.els.topCont,e=this,f=this.els.body.firstChild,g=f.offsetHeight,h=d.style;h.position="absolute",h.left=a+"px",h.top=b+"px",h.zIndex=1e4,h.display="",c&&(f.style.marginTop=-g+"px",this.args.opacity>1&&bf(d,0),this._showAnim=bd({onUpdate:function(a,b){f.style.marginTop=-b(be.accel_b(a),g,0)+"px",e.args.opacity>1&&bf(d,a)},onStop:function(){e.args.opacity>1&&bf(d,""),e._showAnim=null}}))},h.hide=function(){var a=this.els.topCont,b=this,c=this.els.body.firstChild,d=c.offsetHeight,e=bi(a).y;this.args.animation?(this._showAnim&&this._showAnim.stop(),this._showAnim=bd({onUpdate:function(f,g){b.args.opacity>1&&bf(a,1-f),c.style.marginTop=-g(be.accel_b(f),0,d)+"px",a.style.top=g(be.accel_ab(f),e,e-10)+"px"},onStop:function(){a.style.display="none",c.style.marginTop="",b.args.opacity>1&&bf(a,""),b._showAnim=null}})):a.style.display="none",this.inputField=null},h.popup=function(a,b){function h(b){var c={x:i.x,y:i.y};if(!b)return c;/B/.test(b)&&(c.y+=a.offsetHeight),/b/.test(b)&&(c.y+=a.offsetHeight-f.y),/T/.test(b)&&(c.y-=f.y),/l/.test(b)&&(c.x-=f.x-a.offsetWidth),/L/.test(b)&&(c.x-=f.x),/R/.test(b)&&(c.x+=a.offsetWidth),/c/i.test(b)&&(c.x+=(a.offsetWidth-f.x)/2),/m/i.test(b)&&(c.y+=(a.offsetHeight-f.y)/2);return c}a=bm(a),b||(b=this.args.align),b=b.split(/\x2f/);var c=bi(a),d=this.els.topCont,e=d.style,f,g=bj();e.visibility="hidden",e.display="",this.showAt(0,0),document.body.appendChild(d),f={x:d.offsetWidth,y:d.offsetHeight};var i=c;i=h(b[0]),i.y<g.y&&(i.y=c.y,i=h(b[1])),i.x+f.x>g.x+g.w&&(i.x=c.x,i=h(b[2])),i.y+f.y>g.y+g.h&&(i.y=c.y,i=h(b[3])),i.x<g.x&&(i.x=c.x,i=h(b[4])),this.showAt(i.x,i.y,!0),e.visibility="",this.focus()},h.manageFields=function(b,c,d){var e=this;c=bm(c),b=bm(b),/^button$/i.test(b.tagName)&&b.setAttribute("type","button"),V(b,"click",function(){e.inputField=c,e.dateFormat=d;if(e.selection.type==a.SEL_SINGLE){var f,g,h,i;f=/input|textarea/i.test(c.tagName)?c.value:c.innerText||c.textContent,f&&(g=/(^|[^%])%[bBmo]/.exec(d),h=/(^|[^%])%[de]/.exec(d),g&&h&&(i=g.index<h.index),f=Calendar.parseDate(f,i),f&&(e.selection.set(f,!1,!0),e.args.showTime&&(e.setHours(f.getHours()),e.setMinutes(f.getMinutes())),e.moveTo(f)))}e.popup(b)})},h.callHooks=function(a){var b=ba(arguments,1),c=this.handlers[a],d=0;for(;d<c.length;++d)c[d].apply(this,b)},h.addEventListener=function(a,b){this.handlers[a].push(b)},h.removeEventListener=function(a,b){var c=this.handlers[a],d=c.length;while(--d>=0)c[d]===b&&c.splice(d,1)},h.getTime=function(){return this.time},h.setTime=function(a,b){if(this.args.showTime){a=a!=null?a:this.time,this.time=a;var c=this.getHours(),d=this.getMinutes(),e=c<12;this.args.showTime==12&&(c==0&&(c=12),c>12&&(c-=12),this.els.timeAM.innerHTML=L(e?"AM":"PM")),c<10&&(c="0"+c),d<10&&(d="0"+d),this.els.timeHour.innerHTML=c,this.els.timeMinute.innerHTML=d,b||this.callHooks("onTimeChange",this,a)}},h.getHours=function(){return Math.floor(this.time/100)},h.getMinutes=function(){return this.time%100},h.setHours=function(a){a<0&&(a+=24),this.setTime(100*(a%24)+this.time%100)},h.setMinutes=function(a){a<0&&(a+=60),a=Math.floor(a/this.args.minuteStep)*this.args.minuteStep,this.setTime(100*this.getHours()+a%60)},h._getInputYear=function(){var a=parseInt(this.els.yearInput.value,10);isNaN(a)&&(a=this.date.getFullYear());return a},h._showTooltip=function(a){var b="",c,d=this.els.tooltip;a&&(a=P(a),c=this.args.dateInfo(a),c&&c.tooltip&&(b="<div class='DynarchCalendar-tooltipCont'>"+R(a,c.tooltip)+"</div>")),d.innerHTML=b};var j=" align='center' cellspacing='0' cellpadding='0'",r={"DynarchCalendar-topCont":"topCont","DynarchCalendar-focusLink":"focusLink",DynarchCalendar:"main","DynarchCalendar-topBar":"topBar","DynarchCalendar-title":"title","DynarchCalendar-dayNames":"dayNames","DynarchCalendar-body":"body","DynarchCalendar-menu":"menu","DynarchCalendar-menu-year":"yearInput","DynarchCalendar-bottomBar":"bottomBar","DynarchCalendar-tooltip":"tooltip","DynarchCalendar-time-hour":"timeHour","DynarchCalendar-time-minute":"timeMinute","DynarchCalendar-time-am":"timeAM","DynarchCalendar-navBtn DynarchCalendar-prevYear":"navPrevYear","DynarchCalendar-navBtn DynarchCalendar-nextYear":"navNextYear","DynarchCalendar-navBtn DynarchCalendar-prevMonth":"navPrevMonth","DynarchCalendar-navBtn DynarchCalendar-nextMonth":"navNextMonth"},x={"-3":"backYear","-2":"back",0:"now",2:"fwd",3:"fwdYear"},H={37:-1,38:-2,39:1,40:2},I={33:-1,34:1};h._getDateDiv=function(a){var b=null;if(a)try{bc(this.els.body,function(c){if(c.getAttribute("dyc-date")==a)throw b=c})}catch(c){}return b},(a.Selection=function(a,b,c,d){this.type=b,this.sel=a instanceof Array?a:[a],this.onChange=bb(c,d),this.cal=d}).prototype={get:function(){return this.type==a.SEL_SINGLE?this.sel[0]:this.sel},isEmpty:function(){return this.sel.length==0},set:function(b,c,d){var e=this.type==a.SEL_SINGLE;b instanceof Array?(this.sel=b,this.normalize(),d||this.onChange(this)):(b=O(b),e||!this.isSelected(b)?(e?this.sel=[b]:this.sel.splice(this.findInsertPos(b),0,b),this.normalize(),d||this.onChange(this)):c&&this.unselect(b,d))},reset:function(){this.sel=[],this.set.apply(this,arguments)},countDays:function(){var a=0,b=this.sel,c=b.length,d,e,f;while(--c>=0)d=b[c],d instanceof Array&&(e=P(d[0]),f=P(d[1]),a+=Math.round(Math.abs(f.getTime()-e.getTime())/864e5)),++a;return a},unselect:function(a,b){a=O(a);var c=!1;for(var d=this.sel,e=d.length,f;--e>=0;){f=d[e];if(f instanceof Array){if(a>=f[0]&&a<=f[1]){var g=P(a),h=g.getDate();if(a==f[0])g.setDate(h+1),f[0]=O(g),c=!0;else if(a==f[1])g.setDate(h-1),f[1]=O(g),c=!0;else{var i=new Date(g);i.setDate(h+1),g.setDate(h-1),d.splice(e+1,0,[O(i),f[1]]),f[1]=O(g),c=!0}}}else a==f&&(d.splice(e,1),c=!0)}c&&(this.normalize(),b||this.onChange(this))},normalize:function(){this.sel=this.sel.sort(function(a,b){a instanceof Array&&(a=a[0]),b instanceof Array&&(b=b[0]);return a-b});for(var a=this.sel,b=a.length,c,d;--b>=0;){c=a[b];if(c instanceof Array){if(c[0]>c[1]){a.splice(b,1);continue}c[0]==c[1]&&(c=a[b]=c[0])}if(d){var e=d,f=c instanceof Array?c[1]:c;f=P(f),f.setDate(f.getDate()+1),f=O(f);if(f>=e){var g=a[b+1];c instanceof Array&&g instanceof Array?(c[1]=g[1],a.splice(b+1,1)):c instanceof Array?(c[1]=d,a.splice(b+1,1)):g instanceof Array?(g[0]=c,a.splice(b,1)):(a[b]=[c,g],a.splice(b+1,1))}}d=c instanceof Array?c[0]:c}},findInsertPos:function(a){for(var b=this.sel,c=b.length,d;--c>=0;){d=b[c],d instanceof Array&&(d=d[0]);if(d<=a)break}return c+1},clear:function(a){this.sel=[],a||this.onChange(this)},selectRange:function(b,c){b=O(b),c=O(c);if(b>c){var d=b;b=c,c=d}var e=this.cal.args.checkRange;if(!e)return this._do_selectRange(b,c);try{bk((new a.Selection([[b,c]],a.SEL_MULTIPLE,bl)).getDates(),bb(function(a){if(this.isDisabled(a)){e instanceof Function&&e(a,this);throw"OUT"}},this.cal)),this._do_selectRange(b,c)}catch(f){}},_do_selectRange:function(a,b){this.sel.push([a,b]),this.normalize(),this.onChange(this)},isSelected:function(a){for(var b=this.sel.length,c;--b>=0;){c=this.sel[b];if(c instanceof Array&&a>=c[0]&&a<=c[1]||a==c)return!0}return!1},getFirstDate:function(){var a=this.sel[0];a&&a instanceof Array&&(a=a[0]);return a},getLastDate:function(){if(this.sel.length>0){var a=this.sel[this.sel.length-1];a&&a instanceof Array&&(a=a[1]);return a}},print:function(a,b){var c=[],d=0,e,f=this.cal.getHours(),g=this.cal.getMinutes();b||(b=" -> ");while(d<this.sel.length)e=this.sel[d++],e instanceof Array?c.push(R(P(e[0],f,g),a)+b+R(P(e[1],f,g),a)):c.push(R(P(e,f,g),a));return c},getDates:function(a){var b=[],c=0,d,e;while(c<this.sel.length){e=this.sel[c++];if(e instanceof Array){d=P(e[0]),e=e[1];while(O(d)<e)b.push(a?R(d,a):new Date(d)),d.setDate(d.getDate()+1)}else d=P(e);b.push(a?R(d,a):d)}return b}},a.isUnicodeLetter=function(a){return a.toUpperCase()!=a.toLowerCase()},a.parseDate=function(b,c,d){if(!/\S/.test(b))return"";b=b.replace(/^\s+/,"").replace(/\s+$/,""),d=d||new Date;var e=null,f=null,g=null,h=null,i=null,j=null,k=b.match(/([0-9]{1,2}):([0-9]{1,2})(:[0-9]{1,2})?\s*(am|pm)?/i);k&&(h=parseInt(k[1],10),i=parseInt(k[2],10),j=k[3]?parseInt(k[3].substr(1),10):0,b=b.substring(0,k.index)+b.substr(k.index+k[0].length),k[4]&&(k[4].toLowerCase()=="pm"&&h<12?h+=12:k[4].toLowerCase()=="am"&&h>=12&&(h-=12)));var l=function(){function k(a){d.push(a)}function j(){var a="";while(g()&&/[0-9]/.test(g()))a+=f();if(h(g()))return i(a);return parseInt(a,10)}function i(a){while(g()&&h(g()))a+=f();return a}function g(){return b.charAt(c)}function f(){return b.charAt(c++)}var c=0,d=[],e,h=a.isUnicodeLetter;while(c<b.length)e=g(),h(e)?k(i("")):/[0-9]/.test(e)?k(j()):f();return d}(),m=[];for(var n=0;n<l.length;++n){var o=l[n];/^[0-9]{4}$/.test(o)?(e=parseInt(o,10),f==null&&g==null&&c==null&&(c=!0)):/^[0-9]{1,2}$/.test(o)?(o=parseInt(o,10),o<60?o<0||o>12?o>=1&&o<=31&&(g=o):m.push(o):e=o):f==null&&(f=T(o))}m.length<2?m.length==1&&(g==null?g=m.shift():f==null&&(f=m.shift())):c?(f==null&&(f=m.shift()),g==null&&(g=m.shift())):(g==null&&(g=m.shift()),f==null&&(f=m.shift())),e==null&&(e=m.length>0?m.shift():d.getFullYear()),e<30?e+=2e3:e<99&&(e+=1900),f==null&&(f=d.getMonth()+1);return e!=null&&f!=null&&g!=null?new Date(e,f-1,g,h,i,j):null};var be={elastic_b:function(a){return 1-Math.cos(-a*5.5*Math.PI)/Math.pow(2,7*a)},magnetic:function(a){return 1-Math.cos(a*a*a*10.5*Math.PI)/Math.exp(4*a)},accel_b:function(a){a=1-a;return 1-a*a*a*a},accel_a:function(a){return a*a*a},accel_ab:function(a){a=1-a;return 1-Math.sin(a*a*Math.PI/2)},accel_ab2:function(a){return(a/=.5)<1?.5*a*a:-0.5*(--a*(a-2)-1)},brakes:function(a){a=1-a;return 1-Math.sin(a*a*Math.PI)},shake:function(a){return a<.5?-Math.cos(a*11*Math.PI)*a*a:(a=1-a,Math.cos(a*11*Math.PI)*a*a)}},bl=new Function;return a}()
 var Static_AutosuggestResponseData;var swStoreEntry=1;if(typeof(bsn)=="undefined")
 _b=bsn={};if(typeof(_b.Autosuggest)=="undefined")
diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php
index dc3a69492..6e140833d 100755
--- a/gulliver/system/class.xmlform.php
+++ b/gulliver/system/class.xmlform.php
@@ -1454,22 +1454,24 @@ class XmlForm_Field_Suggest extends XmlForm_Field_SimpleText //by neyek
                 $sOptions .= '  var newcont; ';
                 $sOptions .= '  eval(\'newcont=\' + response + \';\'); ';
                 $sOptions .= '  for(var i = 0; i<newcont.length; i++) { ';
-                $sOptions .= '    var j = getField(newcont[i].name); ';
+                //$sOptions .= '    var j = getField(newcont[i].name); ';
                 $sOptions .= '    getField(newcont[i].name).value = newcont[i].value; ';
-                $sOptions .= '    if (newcont[i].content.type == \'dropdown\') { ';
-
-                $sOptions .= '   getField(newcont[i].name).options.length = 0;   ';
-
-                $sOptions .= '  for (ni = 0; ni < newcont[i].content.options.length; ni++ ) {
-                                getField(newcont[i].name).options[ni] = new Option(newcont[i].content.options[ni].value, newcont[i].content.options[ni].key);
-                            }
-
-                            if (getField(newcont[i].name).options.length == 0) {
-                                getField(newcont[i].name).options[0] = new Option("", "");
-                            }';
-
-                $sOptions .= '    } ';
+                $sOptions .= '
+                                  switch (newcont[i].content.type) {
+                                      case "dropdown":
+                                          dropDownSetOption({element: getField(newcont[i].name), name: newcont[i].name}, newcont[i].content);
+                                          break;
+                                      case "text":
+                                          getField(newcont[i].name).value = "";
 
+                                          if (newcont[i].content.options) {
+                                              if (newcont[i].content.options[0]) {
+                                                  getField(newcont[i].name).value = newcont[i].content.options[0].value;
+                                              }
+                                          }
+                                          break;
+                                  }
+                ';
                 $sOptions .= '  } ';
                 $sOptions .= '} else { ';
                 $sOptions .= '  alert(\'Invalid response: \' + response); ';
@@ -1636,21 +1638,12 @@ class XmlForm_Field_Suggest extends XmlForm_Field_SimpleText //by neyek
                 $sOptions .= '  eval(\'newcont=\' + response + \';\'); ';
                 $sOptions .= '';
                 $sOptions .= '  for(var i = 0; i<newcont.length; i++) { ';
-                // $sOptions .= '    var depField = getField(\'' . $rowIdField . '[\' + ' . 'newcont[i].name); ';
-                $sOptions .= '    var depField = \'' . $rowIdField . '[\' + ' . 'newcont[i].name; ';
+                $sOptions .= '    var depField = "' . $rowIdField . '[" + newcont[i].name; ';
                 $sOptions .= '    getField(depField).value = newcont[i].value; ';
                 $sOptions .= '
                                   switch (newcont[i].content.type) {
                                       case "dropdown":
-                                          getField(depField).options.length = 0;
-
-                                          for (ni = 0; ni < newcont[i].content.options.length; ni++ ){
-                                              getField(depField).options[ni] = new Option(newcont[i].content.options[ni].value, newcont[i].content.options[ni].key);
-                                          }
-
-                                          if (getField(depField).options.length == 0) {
-                                              getField(depField).options[0] = new Option("", "");
-                                          }
+                                          dropDownSetOption({element: getField(depField), name: depField}, newcont[i].content);
                                           break;
                                       case "text":
                                           getField(depField).value = "";
@@ -3356,10 +3349,11 @@ class XmlForm_Field_Dropdown extends XmlForm_Field
     public $required = false;
     public $dependentFields = '';
     public $readonly = false;
-    public $option = array ();
+    public $optgroup = 0;
+    public $option = array();
     public $sqlConnection = 0;
     public $sql = '';
-    public $sqlOption = array ();
+    public $sqlOption = array();
     public $saveLabel = 0;
     public $modeGridDrop = '';
     public $renderMode = '';
@@ -3427,43 +3421,82 @@ class XmlForm_Field_Dropdown extends XmlForm_Field
             $html .= $this->NSGridLabel() . ' ';
             $html .= $rowId == '' ? $this->NSFieldType() : $this->NSGridType() . ' ';
             $html .= $this->NSDependentFields( true ) . ' ';
-            $html .= '>';
+            $html = $html . (($this->optgroup == 1)? "pm:optgroup=\"1\" " : null);
+            $html = $html . ">";
 
             $findValue = '';
             $firstValue = '';
-            $cont = 0;
+            $count = 0;
             $swOption = 0;
 
-            foreach ($this->option as $optValue => $optName) {
-                settype( $optValue, 'string' );
-                $html .= '<option value="' . $optValue . '" ' . (($optValue === $value) ? 'selected="selected"' : '') . '>' . $optName . '</option>';
-                if ($optValue === $value) {
-                    $findValue = $optValue;
-                    $displayLabel = $optName;
-                }
-                if ($firstValue == '') {
-                    $firstValue = $optValue;
-                }
+            $htmlOptGroup = null;
+            $swOptGroupPrev = 0;
+            $swAppend = 0;
 
-                $cont = $cont + 1;
-                $swOption = 1;
+            foreach ($this->option as $optValue => $optName) {
+                settype($optValue, "string");
+
+                if ($this->optgroup == 1 && preg_match("/^optgroup\d+$/", $optValue)) {
+                    if ($swOptGroupPrev == 1 && $swAppend == 1) {
+                        $html = $html . "</optgroup>";
+                    }
+
+                    $htmlOptGroup = "<optgroup label=\"$optName\">";
+                    $swOptGroupPrev = 1;
+                    $swAppend = 0;
+                } else {
+                    $html = $html . $htmlOptGroup . "<option value=\"$optValue\"" . (($optValue == $value)? " selected=\"selected\"" : null) . ">$optName</option>";
+                    $htmlOptGroup = null;
+                    $swAppend = 1;
+
+                    if ($optValue === $value) {
+                        $findValue = $optValue;
+                        $displayLabel = $optName;
+                    }
+
+                    if ($firstValue == "") {
+                        $firstValue = $optValue;
+                    }
+
+                    $count = $count + 1;
+                    $swOption = 1;
+                }
             }
 
             foreach ($this->sqlOption as $optValue => $optName) {
-                settype( $optValue, 'string' );
-                $html .= '<option value="' . $optValue . '" ' . (($optValue === $value) ? 'selected="selected"' : '') . '>' . $optName . '</option>';
-                if ($optValue === $value) {
-                    $findValue = $optValue;
-                    $displayLabel = $optName;
-                }
-                if ($firstValue == '') {
-                    $firstValue = $optValue;
-                }
+                settype($optValue, "string");
 
-                $swOption = 1;
+                if ($this->optgroup == 1 && preg_match("/^optgroup\d+$/", $optValue)) {
+                    if ($swOptGroupPrev == 1 && $swAppend == 1) {
+                        $html = $html . "</optgroup>";
+                    }
+
+                    $htmlOptGroup = "<optgroup label=\"$optName\">";
+                    $swOptGroupPrev = 1;
+                    $swAppend = 0;
+                } else {
+                    $html = $html . $htmlOptGroup . "<option value=\"$optValue\"" . (($optValue == $value)? " selected=\"selected\"" : null) . ">$optName</option>";
+                    $htmlOptGroup = null;
+                    $swAppend = 1;
+
+                    if ($optValue === $value) {
+                        $findValue = $optValue;
+                        $displayLabel = $optName;
+                    }
+
+                    if ($firstValue == "") {
+                        $firstValue = $optValue;
+                    }
+
+                    $swOption = 1;
+                }
             }
 
-            if ($swOption == 0) {
+            if ($swOption == 1) {
+                if ($swOptGroupPrev == 1 && $swAppend == 1) {
+                    $html = $html . "</optgroup>";
+                }
+            } else {
                 $html = $html . "<option value=\"\"></option>";
             }
 
@@ -3474,8 +3507,8 @@ class XmlForm_Field_Dropdown extends XmlForm_Field
                 $html .= 'name="form' . $rowId . '[' . $this->name . ']" ';
                 $html .= 'value="' . (($findValue != '') ? $findValue : $firstValue) . '" />';
             }
-            $this->selectedValue = ($findValue != '') ? $findValue : ($cont == 0) ? $firstValue : '';
 
+            $this->selectedValue = ($findValue != "")? $findValue : ($count == 0)? $firstValue : "";
         } else {
             //Render Field showing only value;
             foreach ($this->option as $optValue => $optName) {
diff --git a/workflow/engine/methods/dynaforms/fields_Edit.php b/workflow/engine/methods/dynaforms/fields_Edit.php
index b4352c326..57a157269 100755
--- a/workflow/engine/methods/dynaforms/fields_Edit.php
+++ b/workflow/engine/methods/dynaforms/fields_Edit.php
@@ -137,7 +137,17 @@ if (! (isset( $fields->Fields['XMLNODE_NAME'] ) && ($fields->Fields['XMLNODE_NAM
     if (! is_array( $options ) || count( $options ) == 0) {
         $options = array ('' => '' );
     }
-    $Fields['PME_OPTIONS'] = array ('NAME' => array_keys( $options ),'LABEL' => array_values( $options ) );
+
+    $arrayOptionName = array_keys($options);
+    $arrayOptionLabel = array_values($options);
+    $arrayOptionOptGroup = array();
+
+    foreach ($arrayOptionName as $value) {
+        $arrayOptionOptGroup[] = (preg_match("/^optgroup\d+$/", $value))? 1 : 0;
+    }
+
+    $Fields["PME_OPTIONS"] = array("NAME" => $arrayOptionName, "LABEL" => $arrayOptionLabel, "OPTGROUP" => $arrayOptionOptGroup);
+
     $type = strtolower( $fields->Fields['TYPE'] );
     if ($type === 'checkbox') {
         if ($Fields['PME_DEFAULTVALUE'] === $Fields['PME_VALUE']) {
diff --git a/workflow/engine/methods/dynaforms/fields_Save.php b/workflow/engine/methods/dynaforms/fields_Save.php
index 40487bd0b..669802b83 100755
--- a/workflow/engine/methods/dynaforms/fields_Save.php
+++ b/workflow/engine/methods/dynaforms/fields_Save.php
@@ -55,6 +55,8 @@ if (isset($_POST['form']['PME_READONLY'])) {
     $_POST['form']['PME_READONLY'] = 0;
 }
 
+$_POST["form"]["PME_OPTGROUP"] = (isset($_POST["form"]["PME_OPTGROUP"]) && !empty($_POST["form"]["PME_OPTGROUP"]))? intval($_POST["form"]["PME_OPTGROUP"]) : 0;
+
 if (isset($_POST['form']['PME_SAVELABEL'])) {
     if ($_POST['form']['PME_SAVELABEL'] == '') {
         $_POST['form']['PME_SAVELABEL'] = 0;
@@ -131,6 +133,7 @@ if (file_exists(PATH_XMLFORM . 'dynaforms/fields/' . $type . '.xml')) {
         }
     }
 }
+
 foreach ($_POST['form'] as $key => $value) {
     if (substr($key, 0, 4) === 'PME_') {
         $res[substr($key, 4)] = $value;
@@ -138,6 +141,7 @@ foreach ($_POST['form'] as $key => $value) {
         $res[$key] = $value;
     }
 }
+
 $_POST['form'] = $res;
 
 $dbc = new DBConnection(PATH_DYNAFORM . $file . '.xml', '', '', '', 'myxml');
@@ -261,3 +265,4 @@ if (isset($sType) && $sType === 'javascript') {
     $editor = new dynaformEditorAjax($_POST);
     $editor->set_javascript($A, $fieldName, $sCode);
 }
+
diff --git a/workflow/engine/xmlform/dynaforms/fields/_options.xml b/workflow/engine/xmlform/dynaforms/fields/_options.xml
index a682c2973..a530fa866 100755
--- a/workflow/engine/xmlform/dynaforms/fields/_options.xml
+++ b/workflow/engine/xmlform/dynaforms/fields/_options.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dynaForm name="_options" type="grid" width="100%" editRow="0" insertRow="0">
-
-<NAME type="text" validate="Field">
-  <en>Value</en>
+<NAME type="text" validate="Field" size="25">
+    <en>Value</en>
 </NAME>
-<LABEL type="text"><en>Label</en>
+<LABEL type="text" size="25">
+    <en>Label</en>
 </LABEL>
-</dynaForm>
\ No newline at end of file
+<OPTGROUP type="checkbox" value="1" falsevalue="0" defaultvalue="0">
+    <en>Option Group</en>
+</OPTGROUP>
+</dynaForm>
+
diff --git a/workflow/engine/xmlform/dynaforms/fields/dropdown.html b/workflow/engine/xmlform/dynaforms/fields/dropdown.html
index cf899410e..986496d11 100755
--- a/workflow/engine/xmlform/dynaforms/fields/dropdown.html
+++ b/workflow/engine/xmlform/dynaforms/fields/dropdown.html
@@ -1,113 +1,125 @@
-<form id="{$form_id}" name="{$form_name}" action="{$form_action}" class="{$form_className}" method="post" encType="multipart/form-data" style="margin:0px;" onsubmit='return validateForm("{$form_objectRequiredFields}".parseJSON());'>
-
-<div class="borderForm" style="padding-left: 0pt; padding-right: 0pt;">
-		<div class="boxTop"><div class="a"></div><div class="b"></div><div class="c"></div></div>
-		<div class="content" style="">
-	  <table width="99%">
-      <tbody><tr>
-        <td valign="top">
-        <input class="notValidateThisFields" name="__notValidateThisFields__" id="__notValidateThisFields__" value="" type="hidden">
-        <input name="DynaformRequiredFields" id="DynaformRequiredFields" value="{$form_objectRequiredFields}" type="hidden">
-           <table border="0" cellpadding="0" cellspacing="0" width="100%">
-                                  <tbody><tr style="display: none;">
-              <td colspan="2">{$form.PME_A}</td>
-             </tr>
-                                              <tr style="display: none;">
-              <td colspan="2">{$form.PME_TYPE}</td>
-             </tr>
-                                              <tr style="display: none;">
-              <td colspan="2">{$form.PME_PRO_UID}</td>
-             </tr>
-                                               <tr>
-              <td class="FormTitle" colspan="2" align="">{$form.PME_TITLE}</td>
-             </tr>
-                                                <tr>
-              <td class="FormLabel" width="{$form_labelWidth}"><font color="red">*  </font>{$PME_XMLNODE_NAME}</td>
-              <!-- <td class='FormFieldContent' width="{$form_width}" >{$form.PME_XMLNODE_NAME} </td>  //-->
-              <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PME_XMLNODE_NAME}</td>
-              </tr>
-                                              <tr style="display: none;">
-              <td colspan="2">{$form.PME_XMLNODE_NAME_OLD}</td>
-             </tr>
-                                              <tr style="display: none;">
-              <td colspan="2">{$form.PME_VALIDATE_NAME}</td>
-             </tr>
-                                                <tr>
-              <td class="FormLabel" width="{$form_labelWidth}">{$PME_LABEL}</td>
-              <!-- <td class='FormFieldContent' width="{$form_width}" >{$form.PME_LABEL} </td>  //-->
-              <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PME_LABEL}</td>
-              </tr>
-                                               <tr>
-              <td class="FormTitle" colspan="2" align="">{$form.PME_SUBTITLE3}</td>
-             </tr>
-                                                <tr>
-              <td class="FormLabel" width="{$form_labelWidth}">{$PME_REQUIRED}</td>
-              <!-- <td class='FormFieldContent' width="{$form_width}" >{$form.PME_REQUIRED} </td>  //-->
-              <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PME_REQUIRED}</td>
-              </tr>
-                                                <tr>
-              <td class="FormLabel" width="{$form_labelWidth}">{$PME_READONLY}</td>
-              <!-- <td class='FormFieldContent' width="{$form_width}" >{$form.PME_READONLY} </td>  //-->
-              <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PME_READONLY}</td>
-              </tr>
-                                                <tr>
-              <td class="FormLabel" width="{$form_labelWidth}">{$PME_DEPENDENTFIELDS}</td>
-              <!-- <td class='FormFieldContent' width="{$form_width}" >{$form.PME_DEPENDENTFIELDS} </td>  //-->
-              <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PME_DEPENDENTFIELDS}</td>
-              </tr>
-                                                <tr>
-              <td class="FormLabel" width="{$form_labelWidth}">{$PME_DEFAULTVALUE}</td>
-              <!-- <td class='FormFieldContent' width="{$form_width}" >{$form.PME_DEFAULTVALUE} </td>  //-->
-              <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PME_DEFAULTVALUE}</td>
-              </tr>
-              <!--                                  <tr>
-              <td class="FormLabel" width="{$form_labelWidth}">{$PME_SAVELABEL}</td>
-              <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PME_SAVELABEL}</td>
-              </tr>-->
-                                                <tr>
-              <td class="FormLabel" width="{$form_labelWidth}">{$PME_HINT}</td>
-              <!-- <td class='FormFieldContent' width="{$form_width}" >{$form.PME_HINT} </td>  //-->
-              <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PME_HINT}</td>
-              </tr>
-                                               <tr>
-              <td class="FormTitle" colspan="2" align="">{$form.PME_SUBTITLE}</td>
-             </tr>
-                                                <tr>
-              <td class="FormLabel" width="{$form_labelWidth}">{$PME_MODE}</td>
-              <!-- <td class='FormFieldContent' width="{$form_width}" >{$form.PME_MODE} </td>  //-->
-              <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PME_MODE}</td>
-              </tr>
-                                               <tr>
-              <td class="FormTitle" colspan="2" align="">{$form.PME_SUBTITLE2}</td>
-             </tr>
-                                                <tr>
-              <td class="FormLabel" width="{$form_labelWidth}">{$PME_SQLCONNECTION}</td>
-              <!-- <td class='FormFieldContent' width="{$form_width}" >{$form.PME_SQLCONNECTION} </td>  //-->
-              <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PME_SQLCONNECTION}</td>
-              </tr>
-                                                <tr>
-              <td class="FormLabel" width="{$form_labelWidth}">{$PME_XMLNODE_VALUE}</td>
-              <!-- <td class='FormFieldContent' width="{$form_width}" >{$form.PME_XMLNODE_VALUE} </td>  //-->
-              <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PME_XMLNODE_VALUE}</td>
-              </tr>
-              <tr>
-                <td class="FormTitle" colspan="2" align="">{$form.PME_SUBTITLE4}</td>
-              </tr>
-                                               <tr>
-              <td colspan="2">{$form.PME_OPTIONS}</td>
-             </tr>
-                                               <tr>
-              <td class="FormButton" colspan="2" align="center"> {$form.PME_ACCEPT} &nbsp; {$form.BTN_CANCEL} </td>
-             </tr>
-                                                                                                     </tbody></table>
-        </td>
-      </tr>
-    </tbody></table>
-    <div class="FormRequiredTextMessage"><font color="red">*  </font>{php}echo (G::LoadTranslation('ID_REQUIRED_FIELD'));{/php}</div>		</div>
-		<div class="boxBottom"><div class="a"></div><div class="b"></div><div class="c"></div></div>
-  </div>
-                                                    <script type="text/javascript">
-    {$form.PME_JS}
-  </script>
-
-</form>
\ No newline at end of file
+<form id="{$form_id}" name="{$form_name}" action="{$form_action}" class="{$form_className}" method="post" encType="multipart/form-data" style="margin:0px;" onsubmit='return validateForm("{$form_objectRequiredFields}".parseJSON());'>
+<div class="borderForm" style="padding-left: 0pt; padding-right: 0pt;">
+    <div class="boxTop"><div class="a"></div><div class="b"></div><div class="c"></div></div>
+    <div class="content" style="">
+        <table width="99%">
+            <tbody>
+            <tr>
+                <td valign="top">
+                    <input class="notValidateThisFields" name="__notValidateThisFields__" id="__notValidateThisFields__" value="" type="hidden">
+                    <input name="DynaformRequiredFields" id="DynaformRequiredFields" value="{$form_objectRequiredFields}" type="hidden">
+
+                    <table border="0" cellpadding="0" cellspacing="0" width="100%">
+                        <tbody>
+                        <tr style="display: none;">
+                            <td colspan="2">{$form.PME_A}</td>
+                        </tr>
+                        <tr style="display: none;">
+                            <td colspan="2">{$form.PME_TYPE}</td>
+                        </tr>
+                        <tr style="display: none;">
+                          <td colspan="2">{$form.PME_PRO_UID}</td>
+                         </tr>
+                        <tr>
+                            <td class="FormTitle" colspan="2" align="">{$form.PME_TITLE}</td>
+                        </tr>
+                        <tr>
+                            <td class="FormLabel" width="{$form_labelWidth}"><font color="red">*  </font>{$PME_XMLNODE_NAME}</td>
+                            <!-- <td class='FormFieldContent' width="{$form_width}" >{$form.PME_XMLNODE_NAME} </td>  //-->
+                            <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PME_XMLNODE_NAME}</td>
+                        </tr>
+                        <tr style="display: none;">
+                            <td colspan="2">{$form.PME_XMLNODE_NAME_OLD}</td>
+                        </tr>
+                        <tr style="display: none;">
+                            <td colspan="2">{$form.PME_VALIDATE_NAME}</td>
+                        </tr>
+                        <tr>
+                            <td class="FormLabel" width="{$form_labelWidth}">{$PME_LABEL}</td>
+                            <!-- <td class='FormFieldContent' width="{$form_width}" >{$form.PME_LABEL} </td>  //-->
+                            <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PME_LABEL}</td>
+                        </tr>
+                        <tr>
+                            <td class="FormTitle" colspan="2" align="">{$form.PME_SUBTITLE3}</td>
+                        </tr>
+                        <tr>
+                            <td class="FormLabel" width="{$form_labelWidth}">{$PME_REQUIRED}</td>
+                            <!-- <td class='FormFieldContent' width="{$form_width}" >{$form.PME_REQUIRED} </td>  //-->
+                            <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PME_REQUIRED}</td>
+                        </tr>
+                        <tr>
+                            <td class="FormLabel" width="{$form_labelWidth}">{$PME_READONLY}</td>
+                            <!-- <td class='FormFieldContent' width="{$form_width}" >{$form.PME_READONLY} </td>  //-->
+                            <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PME_READONLY}</td>
+                        </tr>
+                        <tr>
+                            <td class="FormLabel" width="{$form_labelWidth}">{$PME_OPTGROUP}</td>
+                            <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PME_OPTGROUP}</td>
+                        </tr>
+                        <tr>
+                            <td class="FormLabel" width="{$form_labelWidth}">{$PME_DEPENDENTFIELDS}</td>
+                            <!-- <td class='FormFieldContent' width="{$form_width}" >{$form.PME_DEPENDENTFIELDS} </td>  //-->
+                            <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PME_DEPENDENTFIELDS}</td>
+                        </tr>
+                        <tr>
+                            <td class="FormLabel" width="{$form_labelWidth}">{$PME_DEFAULTVALUE}</td>
+                            <!-- <td class='FormFieldContent' width="{$form_width}" >{$form.PME_DEFAULTVALUE} </td>  //-->
+                            <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PME_DEFAULTVALUE}</td>
+                        </tr>
+                        <!--
+                        <tr>
+                            <td class="FormLabel" width="{$form_labelWidth}">{$PME_SAVELABEL}</td>
+                            <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PME_SAVELABEL}</td>
+                        </tr>
+                        -->
+                        <tr>
+                            <td class="FormLabel" width="{$form_labelWidth}">{$PME_HINT}</td>
+                            <!-- <td class='FormFieldContent' width="{$form_width}" >{$form.PME_HINT} </td>  //-->
+                            <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PME_HINT}</td>
+                        </tr>
+                        <tr>
+                            <td class="FormTitle" colspan="2" align="">{$form.PME_SUBTITLE}</td>
+                        </tr>
+                        <tr>
+                            <td class="FormLabel" width="{$form_labelWidth}">{$PME_MODE}</td>
+                            <!-- <td class='FormFieldContent' width="{$form_width}" >{$form.PME_MODE} </td>  //-->
+                            <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PME_MODE}</td>
+                        </tr>
+                        <tr>
+                            <td class="FormTitle" colspan="2" align="">{$form.PME_SUBTITLE2}</td>
+                        </tr>
+                        <tr>
+                            <td class="FormLabel" width="{$form_labelWidth}">{$PME_SQLCONNECTION}</td>
+                            <!-- <td class='FormFieldContent' width="{$form_width}" >{$form.PME_SQLCONNECTION} </td>  //-->
+                            <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PME_SQLCONNECTION}</td>
+                        </tr>
+                        <tr>
+                            <td class="FormLabel" width="{$form_labelWidth}">{$PME_XMLNODE_VALUE}</td>
+                            <!-- <td class='FormFieldContent' width="{$form_width}" >{$form.PME_XMLNODE_VALUE} </td>  //-->
+                            <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PME_XMLNODE_VALUE}</td>
+                        </tr>
+                        <tr>
+                            <td class="FormTitle" colspan="2" align="">{$form.PME_SUBTITLE4}</td>
+                        </tr>
+                        <tr>
+                            <td colspan="2">{$form.PME_OPTIONS}</td>
+                        </tr>
+                        <tr>
+                            <td class="FormButton" colspan="2" align="center"> {$form.PME_ACCEPT} &nbsp; {$form.BTN_CANCEL} </td>
+                        </tr>
+                     </tbody>
+                    </table>
+                </td>
+            </tr>
+            </tbody>
+        </table>
+        <div class="FormRequiredTextMessage"><font color="red">*  </font>{php}echo (G::LoadTranslation('ID_REQUIRED_FIELD'));{/php}</div>
+    </div>
+    <div class="boxBottom"><div class="a"></div><div class="b"></div><div class="c"></div></div>
+</div>
+
+<script type="text/javascript">
+    {$form.PME_JS}
+</script>
+</form>
+
diff --git a/workflow/engine/xmlform/dynaforms/fields/dropdown.xml b/workflow/engine/xmlform/dynaforms/fields/dropdown.xml
index 5e4f15469..df427c507 100755
--- a/workflow/engine/xmlform/dynaforms/fields/dropdown.xml
+++ b/workflow/engine/xmlform/dynaforms/fields/dropdown.xml
@@ -23,11 +23,14 @@ SELECT XMLNODE_NAME, TYPE FROM dynaForm WHERE XMLNODE_NAME = @@PME_XMLNODE_NAME
 </PME_SUBTITLE3>
 
 <PME_REQUIRED type="checkbox" falseValue="0" value="1" defaultvalue="0" labelOnRight="0">
-  <en>Required</en>
+    <en>Required</en>
 </PME_REQUIRED>
 <PME_READONLY type="checkbox" falseValue="0" value="1" defaultvalue="0" labelOnRight="0">
-  <en>Read Only</en>
+    <en>Read Only</en>
 </PME_READONLY>
+<PME_OPTGROUP type="checkbox" value="1" falseValue="0" defaultvalue="0" labelOnRight="0">
+    <en>Include Option Group</en>
+</PME_OPTGROUP>
 <PME_DEPENDENTFIELDS type="listbox" defaultvalue="" sqlconnection="XMLDB" width="362"><![CDATA[
 select XMLNODE_NAME, XMLNODE_NAME AS NAME FROM dynaForm WHERE XMLNODE_NAME <> @@PME_XMLNODE_NAME AND XMLNODE_NAME <> ""	AND ( TYPE="text" or TYPE="textarea" or TYPE="dropdown" or TYPE="listbox" or TYPE="hidden" )
   ]]><en>Dependent Fields<option name="">(none)</option></en>
@@ -82,6 +85,69 @@ select XMLNODE_NAME, XMLNODE_NAME AS NAME FROM dynaForm WHERE XMLNODE_NAME <> @@
 
 <PME_G_FORM_ID type="phpvariable"/>
 <PME_JS type="javascript"><![CDATA[
+var lblOptGroup = "";
+
+function gridOptionOptGroupColumn(show, swDelete)
+{
+    var tableGrid = document.getElementById("PME_OPTIONS");
+    var i = 0;
+    var j = document.getElementById("form[PME_OPTIONS][1][OPTGROUP]").parentNode.cellIndex;
+
+    var swReadOnly = false;
+    var count = 0;
+
+    for (i = 0; i <= tableGrid.rows.length - 1 - 1; i++) {
+        //tableGrid.rows[i].cells[j].style.display = (show == 1)? "inline" : "none";
+        //tableGrid.rows[i].cells[j].style.visibility = (show == 1)? "visible" : "hidden";
+
+        if (i > 0) {
+            tableGrid.rows[i].cells[j].getElementsByTagName("input")[0].style.visibility = (show == 1)? "visible" : "hidden";
+            swReadOnly = false;
+
+            if (show == 1) {
+                if (tableGrid.rows[i].cells[j].getElementsByTagName("input")[0].checked) {
+                    count = count + 1;
+
+                    tableGrid.rows[i].cells[j - 2].getElementsByTagName("input")[0].value = "optgroup" + count;
+                    swReadOnly = true;
+                }
+            } else {
+                if (tableGrid.rows[i].cells[j].getElementsByTagName("input")[0].checked && swDelete == 0) {
+                    tableGrid.rows[i].cells[j - 2].getElementsByTagName("input")[0].value = "";
+                }
+            }
+
+            tableGrid.rows[i].cells[j - 2].getElementsByTagName("input")[0].readOnly = swReadOnly;
+        } else {
+            if (lblOptGroup == "") {
+                lblOptGroup = tableGrid.rows[i].cells[j].innerHTML;
+            }
+
+            tableGrid.rows[i].cells[j].style.width = "20%";
+            tableGrid.rows[i].cells[j].innerHTML = (show == 1)? lblOptGroup : "";
+        }
+    }
+}
+
+function gridOptionOptGroupCheck(index)
+{
+    var tableGrid = document.getElementById("PME_OPTIONS");
+    var i = 0;
+    var j = document.getElementById("form[PME_OPTIONS][1][OPTGROUP]").parentNode.cellIndex;
+
+    var count = 0;
+
+    document.getElementById("form[PME_OPTIONS][" + index + "][NAME]").value = "";
+    document.getElementById("form[PME_OPTIONS][" + index + "][NAME]").readOnly = (document.getElementById("form[PME_OPTIONS][" + index + "][OPTGROUP]").checked)? true : false;
+
+    for (i = 1; i <= tableGrid.rows.length - 1 - 1; i++) {
+        if (tableGrid.rows[i].cells[j].getElementsByTagName("input")[0].checked) {
+            count = count + 1;
+
+            tableGrid.rows[i].cells[j - 2].getElementsByTagName("input")[0].value = "optgroup" + count;
+        }
+    }
+}
 
 function hideElement( element ) {
   var tr = myTR( element );
@@ -121,5 +187,26 @@ function cancel(){
     currentPopupWindow.remove();
 }
 
+
+
+
+
+getField("PME_OPTGROUP").onclick = function () { gridOptionOptGroupColumn((getField("PME_OPTGROUP").checked)? 1 : 0, 0); };
+
+for (var i = 1; i <= document.getElementById("PME_OPTIONS").rows.length - 1 - 1; i++) {
+    eval("getField(\"PME_OPTIONS][" + i + "][OPTGROUP\").onclick = function () { gridOptionOptGroupCheck(" + i + "); };");
+}
+
+grid_PME_OPTIONS.onaddrow = function (index) {
+    getField("PME_OPTIONS][" + index + "][NAME").readOnly = false;
+    getField("PME_OPTIONS][" + index + "][OPTGROUP").onclick = function () { gridOptionOptGroupCheck(index); };
+}
+
+grid_PME_OPTIONS.ondeleterow = function (index) {
+    gridOptionOptGroupColumn((getField("PME_OPTGROUP").checked)? 1 : 0, 1);
+}
+
+gridOptionOptGroupColumn((getField("PME_OPTGROUP").checked)? 1 : 0, 0);
 ]]></PME_JS>
 </dynaForm>
+