[scupgrade] Merge from pi
authorDavid Baz Fayos <david.baz@openbravo.com>
Wed, 26 Feb 2014 15:15:03 +0100
changeset 22265 20eb3426d990
parent 22264 e6062fe789db (current diff)
parent 22148 4ccde1934056 (diff)
child 22266 12591b3385f8
child 22572 1967d3ea38da
[scupgrade] Merge from pi
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-characteristics.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js
modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonToDataConverter.java
src-wad/src/org/openbravo/wad/CallOutsStructure.java
src-wad/src/org/openbravo/wad/KeyStructure.java
src-wad/src/org/openbravo/wad/TableDirRelation_data.xsql
src-wad/src/org/openbravo/wad/controls/WADControl_data.xsql
src/org/openbravo/costing/Costing_data.xsql
src/org/openbravo/erpCommon/ad_callouts/SE_Supplier_BPartner_data.xsql
src/org/openbravo/erpCommon/ad_callouts/SL_Inventory_Product_data.xsql
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Element_F1.html
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Element_F1.xml
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Element_F2.html
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Element_F2.xml
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Element_FS.html
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Element_FS.xml
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Element_data.xsql
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_F1.html
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_F1.xml
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_F2.html
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_F2.xml
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_FS.html
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_FS.xml
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Field_F1.html
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Field_F1.xml
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Field_F2.html
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Field_F2.xml
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Field_FS.html
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Field_FS.xml
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Field_data.xsql
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_data.xsql
src/org/openbravo/erpCommon/ad_help/EditHelp.java
src/org/openbravo/erpCommon/ad_process/ApplyModules_data.xsql
src/org/openbravo/erpCommon/ad_process/PrintInvoices_data.xsql
src/org/openbravo/erpCommon/ad_process/ProcedureProcess_data.xsql
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportDetail.fo
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportDetail.xml
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.xml
src/org/openbravo/erpCommon/utility/reporting/Order_data.xsql
src/org/openbravo/erpCommon/utility/reporting/printing/Document_data.xsql
web/js/xinha/README
web/js/xinha/contrib/lc_parse_strings.php
web/js/xinha/dialog.js
web/js/xinha/examples/Extended.html
web/js/xinha/examples/custom.css
web/js/xinha/examples/dynamic.css
web/js/xinha/examples/ext_example-body.html
web/js/xinha/examples/ext_example-dest.php
web/js/xinha/examples/ext_example-menu.php
web/js/xinha/examples/ext_example.html
web/js/xinha/examples/ext_example.js
web/js/xinha/examples/full_example-body.html
web/js/xinha/examples/full_example-menu.html
web/js/xinha/examples/full_example.css
web/js/xinha/examples/full_example.html
web/js/xinha/examples/full_example.js
web/js/xinha/examples/stylist.css
web/js/xinha/examples/testbed.html
web/js/xinha/htmlarea.css
web/js/xinha/htmlarea.js
web/js/xinha/images/de/bold.gif
web/js/xinha/images/de/italic.gif
web/js/xinha/images/de/underline.gif
web/js/xinha/images/ed_about.gif
web/js/xinha/images/ed_align.gif
web/js/xinha/images/ed_align_center.gif
web/js/xinha/images/ed_align_justify.gif
web/js/xinha/images/ed_align_left.gif
web/js/xinha/images/ed_align_right.gif
web/js/xinha/images/ed_blank.gif
web/js/xinha/images/ed_buttons_main.gif
web/js/xinha/images/ed_charmap.gif
web/js/xinha/images/ed_clearfonts.gif
web/js/xinha/images/ed_color_bg.gif
web/js/xinha/images/ed_color_fg.gif
web/js/xinha/images/ed_copy.gif
web/js/xinha/images/ed_custom.gif
web/js/xinha/images/ed_cut.gif
web/js/xinha/images/ed_delete.gif
web/js/xinha/images/ed_format_bold.gif
web/js/xinha/images/ed_format_italic.gif
web/js/xinha/images/ed_format_strike.gif
web/js/xinha/images/ed_format_sub.gif
web/js/xinha/images/ed_format_sup.gif
web/js/xinha/images/ed_format_underline.gif
web/js/xinha/images/ed_help.gif
web/js/xinha/images/ed_hr.gif
web/js/xinha/images/ed_html.gif
web/js/xinha/images/ed_image.gif
web/js/xinha/images/ed_indent_less.gif
web/js/xinha/images/ed_indent_more.gif
web/js/xinha/images/ed_killword.gif
web/js/xinha/images/ed_left_to_right.gif
web/js/xinha/images/ed_link.gif
web/js/xinha/images/ed_list_bullet.gif
web/js/xinha/images/ed_list_num.gif
web/js/xinha/images/ed_overwrite.gif
web/js/xinha/images/ed_paste.gif
web/js/xinha/images/ed_print.gif
web/js/xinha/images/ed_redo.gif
web/js/xinha/images/ed_right_to_left.gif
web/js/xinha/images/ed_rmformat.gif
web/js/xinha/images/ed_save.gif
web/js/xinha/images/ed_save.png
web/js/xinha/images/ed_saveas.gif
web/js/xinha/images/ed_selectall.gif
web/js/xinha/images/ed_show_border.gif
web/js/xinha/images/ed_splitblock.gif
web/js/xinha/images/ed_splitcel.gif
web/js/xinha/images/ed_undo.gif
web/js/xinha/images/ed_word_cleaner.gif
web/js/xinha/images/fr/bold.gif
web/js/xinha/images/fr/strikethrough.gif
web/js/xinha/images/fr/underline.gif
web/js/xinha/images/fullscreen_maximize.gif
web/js/xinha/images/fullscreen_minimize.gif
web/js/xinha/images/insert_table.gif
web/js/xinha/images/insertfilelink.gif
web/js/xinha/images/insertmacro.png
web/js/xinha/images/tidy.gif
web/js/xinha/images/toggle_borders.gif
web/js/xinha/inline-dialog.js
web/js/xinha/lang/b5.js
web/js/xinha/lang/ch.js
web/js/xinha/lang/cz.js
web/js/xinha/lang/da.js
web/js/xinha/lang/de.js
web/js/xinha/lang/ee.js
web/js/xinha/lang/el.js
web/js/xinha/lang/es.js
web/js/xinha/lang/fi.js
web/js/xinha/lang/fr.js
web/js/xinha/lang/gb.js
web/js/xinha/lang/he.js
web/js/xinha/lang/hu.js
web/js/xinha/lang/it.js
web/js/xinha/lang/ja.js
web/js/xinha/lang/lt.js
web/js/xinha/lang/lv.js
web/js/xinha/lang/nb.js
web/js/xinha/lang/nl.js
web/js/xinha/lang/no.js
web/js/xinha/lang/pl.js
web/js/xinha/lang/pt_br.js
web/js/xinha/lang/ro.js
web/js/xinha/lang/ru.js
web/js/xinha/lang/se.js
web/js/xinha/lang/sh.js
web/js/xinha/lang/si.js
web/js/xinha/lang/sr.js
web/js/xinha/lang/vn.js
web/js/xinha/license.txt
web/js/xinha/panel-dialog.js
web/js/xinha/plugins/Abbreviation/abbr/de.js
web/js/xinha/plugins/Abbreviation/abbr/en.js
web/js/xinha/plugins/Abbreviation/abbreviation.css
web/js/xinha/plugins/Abbreviation/abbreviation.js
web/js/xinha/plugins/Abbreviation/img/ed_abbreviation.gif
web/js/xinha/plugins/Abbreviation/lang/de.js
web/js/xinha/plugins/Abbreviation/lang/fr.js
web/js/xinha/plugins/Abbreviation/lang/no.js
web/js/xinha/plugins/Abbreviation/popups/abbreviation.html
web/js/xinha/plugins/BackgroundImage/background-image.js
web/js/xinha/plugins/BackgroundImage/backgrounds/blufur.jpg
web/js/xinha/plugins/BackgroundImage/backgrounds/palecnvs.jpg
web/js/xinha/plugins/BackgroundImage/backgrounds/ppplcnvs.jpg
web/js/xinha/plugins/BackgroundImage/backgrounds/thumbnails/blufur.jpg
web/js/xinha/plugins/BackgroundImage/backgrounds/thumbnails/palecnvs.jpg
web/js/xinha/plugins/BackgroundImage/backgrounds/thumbnails/ppplcnvs.jpg
web/js/xinha/plugins/BackgroundImage/backgrounds/thumbnails/ylwsand.jpg
web/js/xinha/plugins/BackgroundImage/backgrounds/ylwsand.jpg
web/js/xinha/plugins/BackgroundImage/img/ed_bgimage.gif
web/js/xinha/plugins/BackgroundImage/lang/de.js
web/js/xinha/plugins/BackgroundImage/lang/fr.js
web/js/xinha/plugins/BackgroundImage/lang/no.js
web/js/xinha/plugins/BackgroundImage/popups/bgimage.html
web/js/xinha/plugins/CSS/css.js
web/js/xinha/plugins/CSS/lang/.keep
web/js/xinha/plugins/CharCounter/char-counter.js
web/js/xinha/plugins/CharCounter/lang/de.js
web/js/xinha/plugins/CharCounter/lang/fr.js
web/js/xinha/plugins/CharCounter/lang/no.js
web/js/xinha/plugins/CharacterMap/CharacterMap.css
web/js/xinha/plugins/CharacterMap/character-map.js
web/js/xinha/plugins/CharacterMap/img/ed_charmap.gif
web/js/xinha/plugins/CharacterMap/lang/de.js
web/js/xinha/plugins/CharacterMap/lang/fr.js
web/js/xinha/plugins/CharacterMap/lang/it.js
web/js/xinha/plugins/CharacterMap/lang/nl.js
web/js/xinha/plugins/CharacterMap/lang/no.js
web/js/xinha/plugins/CharacterMap/lang/ru.js
web/js/xinha/plugins/CharacterMap/popups/select_character.html
web/js/xinha/plugins/ClientsideSpellcheck/clientside-spellcheck.js
web/js/xinha/plugins/ClientsideSpellcheck/img/clientside-spellcheck.gif
web/js/xinha/plugins/ClientsideSpellcheck/img/he-spell-check.gif
web/js/xinha/plugins/ClientsideSpellcheck/lang/de.js
web/js/xinha/plugins/ContextMenu/1.pl
web/js/xinha/plugins/ContextMenu/context-menu.js
web/js/xinha/plugins/ContextMenu/lang/de.js
web/js/xinha/plugins/ContextMenu/lang/el.js
web/js/xinha/plugins/ContextMenu/lang/fr.js
web/js/xinha/plugins/ContextMenu/lang/he.js
web/js/xinha/plugins/ContextMenu/lang/nl.js
web/js/xinha/plugins/ContextMenu/lang/no.js
web/js/xinha/plugins/ContextMenu/lang/pl.js
web/js/xinha/plugins/ContextMenu/menu.css
web/js/xinha/plugins/DoubleClick/double-click.js
web/js/xinha/plugins/DynamicCSS/dynamiccss.js
web/js/xinha/plugins/DynamicCSS/lang/de.js
web/js/xinha/plugins/DynamicCSS/lang/fr.js
web/js/xinha/plugins/DynamicCSS/lang/nl.js
web/js/xinha/plugins/DynamicCSS/lang/no.js
web/js/xinha/plugins/EditTag/edit-tag.js
web/js/xinha/plugins/EditTag/img/ed_edit_tag.gif
web/js/xinha/plugins/EditTag/lang/de.js
web/js/xinha/plugins/EditTag/lang/fr.js
web/js/xinha/plugins/EditTag/lang/no.js
web/js/xinha/plugins/EditTag/popups/edit_tag.html
web/js/xinha/plugins/EnterParagraphs/enter-paragraphs.js
web/js/xinha/plugins/EnterParagraphs/lang/.keep
web/js/xinha/plugins/Equation/equation.js
web/js/xinha/plugins/Equation/img/abs_value.gif
web/js/xinha/plugins/Equation/img/diag_fraction.gif
web/js/xinha/plugins/Equation/img/divide.gif
web/js/xinha/plugins/Equation/img/dsp_greater_equal.gif
web/js/xinha/plugins/Equation/img/dsp_less_equal.gif
web/js/xinha/plugins/Equation/img/dsp_notequal.gif
web/js/xinha/plugins/Equation/img/equation.gif
web/js/xinha/plugins/Equation/img/equation.old.gif
web/js/xinha/plugins/Equation/img/greater_equal_than.gif
web/js/xinha/plugins/Equation/img/hor_fraction.gif
web/js/xinha/plugins/Equation/img/less_equal_than.gif
web/js/xinha/plugins/Equation/img/mul.gif
web/js/xinha/plugins/Equation/img/notequal.gif
web/js/xinha/plugins/Equation/img/parenthesis.gif
web/js/xinha/plugins/Equation/img/root.gif
web/js/xinha/plugins/Equation/img/square_root.gif
web/js/xinha/plugins/Equation/lang/de.js
web/js/xinha/plugins/Equation/lang/fr.js
web/js/xinha/plugins/Equation/lang/no.js
web/js/xinha/plugins/Equation/popups/operations.html
web/js/xinha/plugins/Filter/filter.js
web/js/xinha/plugins/Filter/filters/paragraph.js
web/js/xinha/plugins/Filter/filters/word.js
web/js/xinha/plugins/Filter/img/ed_filter.gif
web/js/xinha/plugins/FindReplace/find-replace.js
web/js/xinha/plugins/FindReplace/fr_engine.js
web/js/xinha/plugins/FindReplace/img/ed_find.gif
web/js/xinha/plugins/FindReplace/lang/de.js
web/js/xinha/plugins/FindReplace/lang/fr.js
web/js/xinha/plugins/FindReplace/lang/no.js
web/js/xinha/plugins/FindReplace/lang/pl.js
web/js/xinha/plugins/FindReplace/lang/pt_br.js
web/js/xinha/plugins/FindReplace/lang/ru.js
web/js/xinha/plugins/FindReplace/popups/find_replace.html
web/js/xinha/plugins/FormOperations/README
web/js/xinha/plugins/FormOperations/default_form.html
web/js/xinha/plugins/FormOperations/form-operations.js
web/js/xinha/plugins/FormOperations/formmail.php
web/js/xinha/plugins/FormOperations/iframe.css
web/js/xinha/plugins/FormOperations/img/buttons.gif
web/js/xinha/plugins/FormOperations/lang/de.js
web/js/xinha/plugins/FormOperations/lang/fr.js
web/js/xinha/plugins/FormOperations/lang/no.js
web/js/xinha/plugins/FormOperations/panel.html
web/js/xinha/plugins/Forms/forms.css
web/js/xinha/plugins/Forms/forms.js
web/js/xinha/plugins/Forms/img/ed_button.gif
web/js/xinha/plugins/Forms/img/ed_checkbox.gif
web/js/xinha/plugins/Forms/img/ed_fieldset.gif
web/js/xinha/plugins/Forms/img/ed_file.gif
web/js/xinha/plugins/Forms/img/ed_form.gif
web/js/xinha/plugins/Forms/img/ed_hidden.gif
web/js/xinha/plugins/Forms/img/ed_image.gif
web/js/xinha/plugins/Forms/img/ed_label.gif
web/js/xinha/plugins/Forms/img/ed_password.gif
web/js/xinha/plugins/Forms/img/ed_radio.gif
web/js/xinha/plugins/Forms/img/ed_reset.gif
web/js/xinha/plugins/Forms/img/ed_select.gif
web/js/xinha/plugins/Forms/img/ed_submit.gif
web/js/xinha/plugins/Forms/img/ed_text.gif
web/js/xinha/plugins/Forms/img/ed_textarea.gif
web/js/xinha/plugins/Forms/lang/.keep
web/js/xinha/plugins/Forms/popups/fieldset.html
web/js/xinha/plugins/Forms/popups/form.html
web/js/xinha/plugins/Forms/popups/input.html
web/js/xinha/plugins/Forms/popups/label.html
web/js/xinha/plugins/Forms/popups/select.html
web/js/xinha/plugins/Forms/popups/textarea.html
web/js/xinha/plugins/FullPage/full-page.js
web/js/xinha/plugins/FullPage/img/docprop.gif
web/js/xinha/plugins/FullPage/lang/de.js
web/js/xinha/plugins/FullPage/lang/fr.js
web/js/xinha/plugins/FullPage/lang/he.js
web/js/xinha/plugins/FullPage/lang/nl.js
web/js/xinha/plugins/FullPage/lang/no.js
web/js/xinha/plugins/FullPage/lang/pl.js
web/js/xinha/plugins/FullPage/lang/ro.js
web/js/xinha/plugins/FullPage/popups/docprop.html
web/js/xinha/plugins/FullPage/test.html
web/js/xinha/plugins/FullScreen/full-screen.js
web/js/xinha/plugins/FullScreen/lang/de.js
web/js/xinha/plugins/FullScreen/lang/fr.js
web/js/xinha/plugins/FullScreen/lang/no.js
web/js/xinha/plugins/FullScreen/lang/pl.js
web/js/xinha/plugins/FullScreen/lang/ru.js
web/js/xinha/plugins/GetHtml/get-html.js
web/js/xinha/plugins/HorizontalRule/horizontal-rule.js
web/js/xinha/plugins/HorizontalRule/img/.keep
web/js/xinha/plugins/HorizontalRule/lang/de.js
web/js/xinha/plugins/HorizontalRule/lang/fr.js
web/js/xinha/plugins/HorizontalRule/lang/no.js
web/js/xinha/plugins/HorizontalRule/popups/edit_horizontal_rule.html
web/js/xinha/plugins/HtmlTidy/README
web/js/xinha/plugins/HtmlTidy/html-tidy-config.cfg
web/js/xinha/plugins/HtmlTidy/html-tidy-logic.php
web/js/xinha/plugins/HtmlTidy/html-tidy.js
web/js/xinha/plugins/HtmlTidy/img/html-tidy.gif
web/js/xinha/plugins/HtmlTidy/lang/de.js
web/js/xinha/plugins/HtmlTidy/lang/fr.js
web/js/xinha/plugins/HtmlTidy/lang/nl.js
web/js/xinha/plugins/HtmlTidy/lang/no.js
web/js/xinha/plugins/ImageManager/Classes/Files.php
web/js/xinha/plugins/ImageManager/Classes/GD.php
web/js/xinha/plugins/ImageManager/Classes/IM.php
web/js/xinha/plugins/ImageManager/Classes/ImageEditor.php
web/js/xinha/plugins/ImageManager/Classes/ImageManager.php
web/js/xinha/plugins/ImageManager/Classes/NetPBM.php
web/js/xinha/plugins/ImageManager/Classes/Thumbnail.php
web/js/xinha/plugins/ImageManager/Classes/Transform.php
web/js/xinha/plugins/ImageManager/README.txt
web/js/xinha/plugins/ImageManager/assets/EditorContent.js
web/js/xinha/plugins/ImageManager/assets/ImageEditor.css
web/js/xinha/plugins/ImageManager/assets/dialog.js
web/js/xinha/plugins/ImageManager/assets/editor.css
web/js/xinha/plugins/ImageManager/assets/editor.js
web/js/xinha/plugins/ImageManager/assets/editorFrame.css
web/js/xinha/plugins/ImageManager/assets/editorFrame.js
web/js/xinha/plugins/ImageManager/assets/hover.htc
web/js/xinha/plugins/ImageManager/assets/imagelist.css
web/js/xinha/plugins/ImageManager/assets/images.js
web/js/xinha/plugins/ImageManager/assets/manager.css
web/js/xinha/plugins/ImageManager/assets/manager.js
web/js/xinha/plugins/ImageManager/assets/popup.js
web/js/xinha/plugins/ImageManager/assets/slider.js
web/js/xinha/plugins/ImageManager/assets/wz_jsgraphics.js
web/js/xinha/plugins/ImageManager/backend.php
web/js/xinha/plugins/ImageManager/config.inc.php
web/js/xinha/plugins/ImageManager/ddt.php
web/js/xinha/plugins/ImageManager/demo_images/bikerpeep.jpg
web/js/xinha/plugins/ImageManager/demo_images/linux/linux.gif
web/js/xinha/plugins/ImageManager/demo_images/wesnoth078.jpg
web/js/xinha/plugins/ImageManager/editor.php
web/js/xinha/plugins/ImageManager/editorFrame.php
web/js/xinha/plugins/ImageManager/image-manager.js
web/js/xinha/plugins/ImageManager/images.php
web/js/xinha/plugins/ImageManager/img/2x2.gif
web/js/xinha/plugins/ImageManager/img/2x2_w.gif
web/js/xinha/plugins/ImageManager/img/btnFolderNew.gif
web/js/xinha/plugins/ImageManager/img/btnFolderUp.gif
web/js/xinha/plugins/ImageManager/img/btn_cancel.gif
web/js/xinha/plugins/ImageManager/img/btn_ok.gif
web/js/xinha/plugins/ImageManager/img/crop.gif
web/js/xinha/plugins/ImageManager/img/default.gif
web/js/xinha/plugins/ImageManager/img/div.gif
web/js/xinha/plugins/ImageManager/img/dots.gif
web/js/xinha/plugins/ImageManager/img/edit_active.gif
web/js/xinha/plugins/ImageManager/img/edit_pencil.gif
web/js/xinha/plugins/ImageManager/img/edit_trash.gif
web/js/xinha/plugins/ImageManager/img/folder.gif
web/js/xinha/plugins/ImageManager/img/hand.gif
web/js/xinha/plugins/ImageManager/img/islocked2.gif
web/js/xinha/plugins/ImageManager/img/locked.gif
web/js/xinha/plugins/ImageManager/img/measure.gif
web/js/xinha/plugins/ImageManager/img/noimages.gif
web/js/xinha/plugins/ImageManager/img/rotate.gif
web/js/xinha/plugins/ImageManager/img/save.gif
web/js/xinha/plugins/ImageManager/img/scale.gif
web/js/xinha/plugins/ImageManager/img/spacer.gif
web/js/xinha/plugins/ImageManager/img/t_black.gif
web/js/xinha/plugins/ImageManager/img/t_white.gif
web/js/xinha/plugins/ImageManager/img/unlocked.gif
web/js/xinha/plugins/ImageManager/img/unlocked2.gif
web/js/xinha/plugins/ImageManager/lang/de.js
web/js/xinha/plugins/ImageManager/lang/fr.js
web/js/xinha/plugins/ImageManager/lang/no.js
web/js/xinha/plugins/ImageManager/lang/pl.js
web/js/xinha/plugins/ImageManager/lang/ru.js
web/js/xinha/plugins/ImageManager/manager.php
web/js/xinha/plugins/ImageManager/newFolder.html
web/js/xinha/plugins/ImageManager/resizer.php
web/js/xinha/plugins/ImageManager/thumbs.php
web/js/xinha/plugins/InsertAnchor/img/insert-anchor.gif
web/js/xinha/plugins/InsertAnchor/img/placeholder.gif
web/js/xinha/plugins/InsertAnchor/insert-anchor.css
web/js/xinha/plugins/InsertAnchor/insert-anchor.js
web/js/xinha/plugins/InsertAnchor/lang/de.js
web/js/xinha/plugins/InsertAnchor/lang/fr.js
web/js/xinha/plugins/InsertAnchor/lang/no.js
web/js/xinha/plugins/InsertAnchor/lang/pl.js
web/js/xinha/plugins/InsertAnchor/popups/insert_anchor.html
web/js/xinha/plugins/InsertMarquee/img/ed_marquee.gif
web/js/xinha/plugins/InsertMarquee/insert-marquee.js
web/js/xinha/plugins/InsertMarquee/lang/de.js
web/js/xinha/plugins/InsertMarquee/lang/fr.js
web/js/xinha/plugins/InsertMarquee/lang/it.js
web/js/xinha/plugins/InsertMarquee/lang/no.js
web/js/xinha/plugins/InsertMarquee/popups/insert_marquee.html
web/js/xinha/plugins/InsertPagebreak/img/pagebreak.gif
web/js/xinha/plugins/InsertPagebreak/insert-pagebreak.js
web/js/xinha/plugins/InsertPagebreak/lang/de.js
web/js/xinha/plugins/InsertPagebreak/lang/fr.js
web/js/xinha/plugins/InsertPagebreak/lang/no.js
web/js/xinha/plugins/InsertPicture/InsertPicture.php
web/js/xinha/plugins/InsertPicture/demo_pictures/bikerpeep.jpg
web/js/xinha/plugins/InsertPicture/demo_pictures/wesnoth078.jpg
web/js/xinha/plugins/InsertPicture/img/btn_open.gif
web/js/xinha/plugins/InsertPicture/img/nopic.gif
web/js/xinha/plugins/InsertPicture/insert-picture.js
web/js/xinha/plugins/InsertPicture/lang/de.js
web/js/xinha/plugins/InsertPicture/lang/fr.js
web/js/xinha/plugins/InsertPicture/lang/no.js
web/js/xinha/plugins/InsertPicture/viewpicture.html
web/js/xinha/plugins/InsertSmiley/img/ed_smiley.gif
web/js/xinha/plugins/InsertSmiley/insert-smiley.js
web/js/xinha/plugins/InsertSmiley/lang/de.js
web/js/xinha/plugins/InsertSmiley/lang/fr.js
web/js/xinha/plugins/InsertSmiley/lang/no.js
web/js/xinha/plugins/InsertSmiley/popups/insertsmiley.html
web/js/xinha/plugins/InsertSmiley/smileys/0001.gif
web/js/xinha/plugins/InsertSmiley/smileys/0002.gif
web/js/xinha/plugins/InsertSmiley/smileys/0003.gif
web/js/xinha/plugins/InsertSmiley/smileys/0004.gif
web/js/xinha/plugins/InsertSmiley/smileys/0005.gif
web/js/xinha/plugins/InsertSmiley/smileys/0006.gif
web/js/xinha/plugins/InsertSmiley/smileys/0007.gif
web/js/xinha/plugins/InsertSmiley/smileys/0008.gif
web/js/xinha/plugins/InsertSmiley/smileys/0009.gif
web/js/xinha/plugins/InsertSmiley/smileys/0010.gif
web/js/xinha/plugins/InsertSmiley/smileys/0011.gif
web/js/xinha/plugins/InsertSmiley/smileys/0012.gif
web/js/xinha/plugins/InsertSmiley/smileys/0013.gif
web/js/xinha/plugins/InsertSmiley/smileys/0014.gif
web/js/xinha/plugins/InsertSmiley/smileys/0015.gif
web/js/xinha/plugins/InsertSmiley/smileys/0016.gif
web/js/xinha/plugins/InsertSmiley/smileys/0017.gif
web/js/xinha/plugins/InsertSmiley/smileys/0018.gif
web/js/xinha/plugins/InsertSmiley/smileys/0019.gif
web/js/xinha/plugins/InsertSmiley/smileys/0020.gif
web/js/xinha/plugins/InsertSmiley/smileys/0021.gif
web/js/xinha/plugins/InsertSmiley/smileys/0022.gif
web/js/xinha/plugins/InsertSmiley/smileys/0023.gif
web/js/xinha/plugins/InsertSmiley/smileys/0024.gif
web/js/xinha/plugins/InsertSmiley/smileys/0025.gif
web/js/xinha/plugins/InsertSmiley/smileys/0026.gif
web/js/xinha/plugins/InsertSmiley/smileys/0027.gif
web/js/xinha/plugins/InsertSmiley/smileys/0028.gif
web/js/xinha/plugins/InsertSmiley/smileys/0029.gif
web/js/xinha/plugins/InsertSmiley/smileys/0030.gif
web/js/xinha/plugins/InsertSmiley/smileys/0031.gif
web/js/xinha/plugins/InsertSmiley/smileys/0032.gif
web/js/xinha/plugins/InsertSmiley/smileys/0033.gif
web/js/xinha/plugins/InsertSmiley/smileys/0034.gif
web/js/xinha/plugins/InsertSmiley/smileys/0035.gif
web/js/xinha/plugins/InsertSmiley/smileys/0036.gif
web/js/xinha/plugins/InsertSmiley/smileys/0037.gif
web/js/xinha/plugins/InsertSmiley/smileys/0038.gif
web/js/xinha/plugins/InsertSmiley/smileys/0039.gif
web/js/xinha/plugins/InsertSmiley/smileys/0040.gif
web/js/xinha/plugins/InsertSmiley/smileys/0041.gif
web/js/xinha/plugins/InsertSmiley/smileys/0042.gif
web/js/xinha/plugins/InsertSmiley/smileys/0043.gif
web/js/xinha/plugins/InsertSmiley/smileys/0044.gif
web/js/xinha/plugins/InsertSmiley/smileys/0045.gif
web/js/xinha/plugins/InsertSmiley/smileys/0046.gif
web/js/xinha/plugins/InsertSmiley/smileys/0047.gif
web/js/xinha/plugins/InsertSmiley/smileys/0048.gif
web/js/xinha/plugins/InsertSmiley/smileys/0049.gif
web/js/xinha/plugins/InsertSmiley/smileys/0050.gif
web/js/xinha/plugins/InsertSmiley/smileys/0051.gif
web/js/xinha/plugins/InsertSmiley/smileys/0052.gif
web/js/xinha/plugins/InsertSmiley/smileys/0053.gif
web/js/xinha/plugins/InsertSmiley/smileys/0054.gif
web/js/xinha/plugins/InsertSmiley/smileys/0055.gif
web/js/xinha/plugins/InsertSmiley/smileys/0056.gif
web/js/xinha/plugins/InsertSmiley/smileys/0057.gif
web/js/xinha/plugins/InsertSmiley/smileys/0058.gif
web/js/xinha/plugins/InsertSmiley/smileys/0059.gif
web/js/xinha/plugins/InsertSmiley/smileys/0060.gif
web/js/xinha/plugins/InsertSmiley/smileys/0061.gif
web/js/xinha/plugins/InsertSmiley/smileys/0062.gif
web/js/xinha/plugins/InsertSmiley/smileys/0063.gif
web/js/xinha/plugins/InsertSmiley/smileys/0064.gif
web/js/xinha/plugins/InsertSmiley/smileys/0065.gif
web/js/xinha/plugins/InsertSmiley/smileys/0066.gif
web/js/xinha/plugins/InsertSmiley/smileys/0067.gif
web/js/xinha/plugins/InsertSmiley/smileys/0068.gif
web/js/xinha/plugins/InsertSmiley/smileys/0069.gif
web/js/xinha/plugins/InsertSmiley/smileys/0070.gif
web/js/xinha/plugins/InsertSmiley/smileys/0071.gif
web/js/xinha/plugins/InsertSmiley/smileys/0072.gif
web/js/xinha/plugins/InsertSmiley/smileys/0073.gif
web/js/xinha/plugins/InsertSmiley/smileys/0074.gif
web/js/xinha/plugins/InsertSmiley/smileys/0075.gif
web/js/xinha/plugins/InsertSmiley/smileys/0076.gif
web/js/xinha/plugins/InsertSmiley/smileys/0077.gif
web/js/xinha/plugins/InsertSmiley/smileys/0078.gif
web/js/xinha/plugins/InsertSmiley/smileys/0079.gif
web/js/xinha/plugins/InsertSmiley/smileys/0080.gif
web/js/xinha/plugins/InsertSmiley/smileys/0081.gif
web/js/xinha/plugins/InsertSmiley/smileys/0082.gif
web/js/xinha/plugins/InsertSmiley/smileys/0083.gif
web/js/xinha/plugins/InsertSmiley/smileys/0084.gif
web/js/xinha/plugins/InsertSmiley/smileys/0085.gif
web/js/xinha/plugins/InsertSmiley/smileys/0086.gif
web/js/xinha/plugins/InsertSmiley/smileys/0087.gif
web/js/xinha/plugins/InsertSmiley/smileys/0088.gif
web/js/xinha/plugins/InsertSmiley/smileys/0089.gif
web/js/xinha/plugins/InsertSmiley/smileys/0090.gif
web/js/xinha/plugins/InsertSmiley/smileys/0091.gif
web/js/xinha/plugins/InsertSmiley/smileys/0092.gif
web/js/xinha/plugins/InsertSmiley/smileys/0093.gif
web/js/xinha/plugins/InsertSmiley/smileys/0094.gif
web/js/xinha/plugins/InsertSmiley/smileys/0095.gif
web/js/xinha/plugins/InsertSmiley/smileys/0096.gif
web/js/xinha/plugins/InsertSmiley/smileys/0097.gif
web/js/xinha/plugins/InsertSmiley/smileys/0098.gif
web/js/xinha/plugins/InsertSmiley/smileys/0099.gif
web/js/xinha/plugins/InsertSmiley/smileys/0100.gif
web/js/xinha/plugins/InsertSmiley/smileys/0101.gif
web/js/xinha/plugins/InsertSmiley/smileys/0102.gif
web/js/xinha/plugins/InsertSmiley/smileys/0103.gif
web/js/xinha/plugins/InsertSmiley/smileys/0104.gif
web/js/xinha/plugins/InsertSmiley/smileys/0105.gif
web/js/xinha/plugins/InsertSmiley/smileys/0106.gif
web/js/xinha/plugins/InsertSmiley/smileys/0107.gif
web/js/xinha/plugins/InsertSmiley/smileys/0108.gif
web/js/xinha/plugins/InsertSmiley/smileys/0109.gif
web/js/xinha/plugins/InsertSmiley/smileys/0110.gif
web/js/xinha/plugins/InsertSmiley/smileys/0111.gif
web/js/xinha/plugins/InsertSmiley/smileys/0112.gif
web/js/xinha/plugins/InsertSmiley/smileys/0113.gif
web/js/xinha/plugins/InsertSmiley/smileys/0114.gif
web/js/xinha/plugins/InsertSmiley/smileys/0115.gif
web/js/xinha/plugins/InsertSmiley/smileys/0116.gif
web/js/xinha/plugins/InsertSmiley/smileys/0117.gif
web/js/xinha/plugins/InsertSmiley/smileys/0118.gif
web/js/xinha/plugins/InsertSmiley/smileys/0119.gif
web/js/xinha/plugins/InsertSmiley/smileys/0120.gif
web/js/xinha/plugins/InsertSmiley/smileys/0121.gif
web/js/xinha/plugins/InsertSmiley/smileys/0122.gif
web/js/xinha/plugins/InsertSmiley/smileys/0123.gif
web/js/xinha/plugins/InsertSmiley/smileys/0124.gif
web/js/xinha/plugins/InsertSmiley/smileys/0125.gif
web/js/xinha/plugins/InsertSmiley/smileys/0126.gif
web/js/xinha/plugins/InsertSmiley/smileys/0127.gif
web/js/xinha/plugins/InsertSmiley/smileys/0128.gif
web/js/xinha/plugins/InsertSmiley/smileys/0129.gif
web/js/xinha/plugins/InsertSmiley/smileys/0130.gif
web/js/xinha/plugins/InsertSmiley/smileys/0131.gif
web/js/xinha/plugins/InsertSmiley/smileys/0132.gif
web/js/xinha/plugins/InsertSmiley/smileys/0133.gif
web/js/xinha/plugins/InsertSmiley/smileys/0134.gif
web/js/xinha/plugins/InsertSmiley/smileys/0135.gif
web/js/xinha/plugins/InsertSmiley/smileys/0136.gif
web/js/xinha/plugins/InsertSmiley/smileys/0137.gif
web/js/xinha/plugins/InsertSmiley/smileys/0138.gif
web/js/xinha/plugins/InsertSmiley/smileys/0139.gif
web/js/xinha/plugins/InsertSmiley/smileys/0140.gif
web/js/xinha/plugins/InsertSmiley/smileys/0141.gif
web/js/xinha/plugins/InsertSmiley/smileys/0142.gif
web/js/xinha/plugins/InsertSmiley/smileys/0143.gif
web/js/xinha/plugins/InsertSmiley/smileys/0144.gif
web/js/xinha/plugins/InsertSmiley/smileys/0145.gif
web/js/xinha/plugins/InsertSmiley/smileys/0146.gif
web/js/xinha/plugins/InsertSmiley/smileys/0147.gif
web/js/xinha/plugins/InsertSmiley/smileys/0148.gif
web/js/xinha/plugins/InsertSmiley/smileys/0149.gif
web/js/xinha/plugins/InsertSmiley/smileys/0150.gif
web/js/xinha/plugins/InsertSmiley/smileys/0151.gif
web/js/xinha/plugins/InsertSmiley/smileys/0152.gif
web/js/xinha/plugins/InsertSmiley/smileys/0153.gif
web/js/xinha/plugins/InsertSmiley/smileys/0154.gif
web/js/xinha/plugins/InsertSmiley/smileys/0155.gif
web/js/xinha/plugins/InsertSmiley/smileys/0156.gif
web/js/xinha/plugins/InsertSmiley/smileys/0157.gif
web/js/xinha/plugins/InsertSmiley/smileys/0158.gif
web/js/xinha/plugins/InsertSmiley/smileys/0159.gif
web/js/xinha/plugins/InsertSmiley/smileys/0160.gif
web/js/xinha/plugins/InsertSmiley/smileys/0161.gif
web/js/xinha/plugins/InsertSmiley/smileys/0162.gif
web/js/xinha/plugins/InsertSmiley/smileys/0163.gif
web/js/xinha/plugins/InsertSmiley/smileys/0164.gif
web/js/xinha/plugins/InsertSmiley/smileys/0165.gif
web/js/xinha/plugins/InsertSmiley/smileys/0166.gif
web/js/xinha/plugins/InsertSmiley/smileys/0167.gif
web/js/xinha/plugins/InsertSmiley/smileys/0168.gif
web/js/xinha/plugins/InsertSmiley/smileys/0169.gif
web/js/xinha/plugins/InsertSmiley/smileys/0170.gif
web/js/xinha/plugins/InsertSmiley/smileys/0171.gif
web/js/xinha/plugins/InsertSmiley/smileys/0172.gif
web/js/xinha/plugins/InsertSmiley/smileys/0173.gif
web/js/xinha/plugins/InsertSmiley/smileys/0174.gif
web/js/xinha/plugins/InsertSmiley/smileys/0175.gif
web/js/xinha/plugins/InsertSmiley/smileys/0176.gif
web/js/xinha/plugins/InsertSmiley/smileys/0177.gif
web/js/xinha/plugins/InsertSmiley/smileys/0178.gif
web/js/xinha/plugins/InsertSmiley/smileys/0179.gif
web/js/xinha/plugins/InsertSmiley/smileys/0180.gif
web/js/xinha/plugins/InsertSmiley/smileys/0181.gif
web/js/xinha/plugins/InsertSmiley/smileys/0182.gif
web/js/xinha/plugins/InsertSmiley/smileys/0183.gif
web/js/xinha/plugins/InsertSmiley/smileys/0184.gif
web/js/xinha/plugins/InsertSmiley/smileys/0185.gif
web/js/xinha/plugins/InsertSmiley/smileys/0186.gif
web/js/xinha/plugins/InsertSmiley/smileys/0187.gif
web/js/xinha/plugins/InsertSmiley/smileys/0188.gif
web/js/xinha/plugins/InsertSmiley/smileys/0189.gif
web/js/xinha/plugins/InsertSmiley/smileys/0190.gif
web/js/xinha/plugins/InsertSmiley/smileys/0191.gif
web/js/xinha/plugins/InsertSmiley/smileys/0192.gif
web/js/xinha/plugins/InsertSmiley/smileys/0193.gif
web/js/xinha/plugins/InsertSmiley/smileys/0194.gif
web/js/xinha/plugins/InsertSmiley/smileys/0195.gif
web/js/xinha/plugins/InsertSmiley/smileys/0196.gif
web/js/xinha/plugins/InsertSmiley/smileys/0197.gif
web/js/xinha/plugins/InsertSmiley/smileys/0198.gif
web/js/xinha/plugins/InsertSmiley/smileys/0199.gif
web/js/xinha/plugins/InsertSmiley/smileys/0200.gif
web/js/xinha/plugins/InsertSmiley/smileys/0201.gif
web/js/xinha/plugins/InsertSmiley/smileys/0202.gif
web/js/xinha/plugins/InsertSmiley/smileys/0203.gif
web/js/xinha/plugins/InsertSmiley/smileys/0204.gif
web/js/xinha/plugins/InsertSmiley/smileys/0205.gif
web/js/xinha/plugins/InsertSmiley/smileys/0206.gif
web/js/xinha/plugins/InsertSmiley/smileys/0207.gif
web/js/xinha/plugins/InsertSmiley/smileys/0208.gif
web/js/xinha/plugins/InsertSmiley/smileys/0209.gif
web/js/xinha/plugins/InsertSmiley/smileys/0210.gif
web/js/xinha/plugins/InsertSmiley/smileys/0211.gif
web/js/xinha/plugins/InsertSmiley/smileys/0212.gif
web/js/xinha/plugins/InsertSmiley/smileys/0213.gif
web/js/xinha/plugins/InsertSmiley/smileys/0214.gif
web/js/xinha/plugins/InsertSmiley/smileys/0215.gif
web/js/xinha/plugins/InsertSmiley/smileys/0216.gif
web/js/xinha/plugins/InsertSmiley/smileys/0217.gif
web/js/xinha/plugins/InsertSmiley/smileys/0218.gif
web/js/xinha/plugins/InsertSmiley/smileys/0219.gif
web/js/xinha/plugins/InsertSmiley/smileys/0220.gif
web/js/xinha/plugins/InsertSmiley/smileys/0221.gif
web/js/xinha/plugins/InsertSmiley/smileys/0222.gif
web/js/xinha/plugins/InsertSmiley/smileys/0223.gif
web/js/xinha/plugins/InsertSmiley/smileys/0224.gif
web/js/xinha/plugins/InsertSmiley/smileys/0225.gif
web/js/xinha/plugins/InsertSmiley/smileys/0226.gif
web/js/xinha/plugins/InsertSmiley/smileys/0227.gif
web/js/xinha/plugins/InsertSmiley/smileys/0228.gif
web/js/xinha/plugins/InsertSmiley/smileys/0229.gif
web/js/xinha/plugins/InsertSmiley/smileys/0230.gif
web/js/xinha/plugins/InsertSmiley/smileys/0231.gif
web/js/xinha/plugins/InsertSmiley/smileys/0232.gif
web/js/xinha/plugins/InsertSmiley/smileys/0233.gif
web/js/xinha/plugins/InsertSmiley/smileys/0234.gif
web/js/xinha/plugins/InsertSmiley/smileys/0235.gif
web/js/xinha/plugins/InsertSmiley/smileys/0236.gif
web/js/xinha/plugins/InsertSmiley/smileys/0237.gif
web/js/xinha/plugins/InsertSmiley/smileys/0238.gif
web/js/xinha/plugins/InsertSmiley/smileys/0239.gif
web/js/xinha/plugins/InsertSmiley/smileys/0240.gif
web/js/xinha/plugins/InsertSmiley/smileys/0241.gif
web/js/xinha/plugins/InsertSmiley/smileys/0242.gif
web/js/xinha/plugins/InsertSmiley/smileys/0243.gif
web/js/xinha/plugins/InsertSmiley/smileys/0244.gif
web/js/xinha/plugins/InsertSmiley/smileys/0245.gif
web/js/xinha/plugins/InsertSmiley/smileys/0246.gif
web/js/xinha/plugins/InsertSmiley/smileys/0247.gif
web/js/xinha/plugins/InsertSmiley/smileys/0248.gif
web/js/xinha/plugins/InsertSmiley/smileys/0249.gif
web/js/xinha/plugins/InsertSmiley/smileys/0250.gif
web/js/xinha/plugins/InsertSmiley/smileys/0251.gif
web/js/xinha/plugins/InsertSmiley/smileys/0252.gif
web/js/xinha/plugins/InsertSmiley/smileys/0253.gif
web/js/xinha/plugins/InsertSmiley/smileys/0254.gif
web/js/xinha/plugins/InsertSmiley/smileys/0255.gif
web/js/xinha/plugins/InsertSmiley/smileys/0256.gif
web/js/xinha/plugins/InsertSmiley/smileys/0257.gif
web/js/xinha/plugins/InsertSmiley/smileys/0258.gif
web/js/xinha/plugins/InsertSmiley/smileys/0259.gif
web/js/xinha/plugins/InsertSmiley/smileys/0260.gif
web/js/xinha/plugins/InsertSmiley/smileys/0261.gif
web/js/xinha/plugins/InsertSmiley/smileys/0262.gif
web/js/xinha/plugins/InsertSmiley/smileys/0263.gif
web/js/xinha/plugins/InsertSmiley/smileys/0264.gif
web/js/xinha/plugins/InsertSmiley/smileys/0265.gif
web/js/xinha/plugins/InsertSmiley/smileys/0266.gif
web/js/xinha/plugins/InsertSmiley/smileys/0267.gif
web/js/xinha/plugins/InsertSmiley/smileys/0268.gif
web/js/xinha/plugins/InsertSmiley/smileys/0269.gif
web/js/xinha/plugins/InsertSmiley/smileys/0270.gif
web/js/xinha/plugins/InsertSmiley/smileys/0271.gif
web/js/xinha/plugins/InsertSmiley/smileys/0272.gif
web/js/xinha/plugins/InsertSmiley/smileys/0273.gif
web/js/xinha/plugins/InsertSmiley/smileys/0274.gif
web/js/xinha/plugins/InsertSmiley/smileys/0275.gif
web/js/xinha/plugins/InsertSmiley/smileys/0276.gif
web/js/xinha/plugins/InsertSmiley/smileys/0277.gif
web/js/xinha/plugins/InsertSmiley/smileys/0278.gif
web/js/xinha/plugins/InsertSmiley/smileys/0279.gif
web/js/xinha/plugins/InsertSmiley/smileys/0280.gif
web/js/xinha/plugins/InsertSmiley/smileys/0281.gif
web/js/xinha/plugins/InsertSmiley/smileys/0282.gif
web/js/xinha/plugins/InsertSmiley/smileys/0283.gif
web/js/xinha/plugins/InsertSmiley/smileys/0284.gif
web/js/xinha/plugins/InsertSmiley/smileys/0285.gif
web/js/xinha/plugins/InsertSmiley/smileys/0286.gif
web/js/xinha/plugins/InsertSmiley/smileys/0287.gif
web/js/xinha/plugins/InsertSmiley/smileys/0288.gif
web/js/xinha/plugins/InsertSmiley/smileys/0289.gif
web/js/xinha/plugins/InsertSmiley/smileys/0290.gif
web/js/xinha/plugins/InsertSmiley/smileys/0291.gif
web/js/xinha/plugins/InsertSmiley/smileys/0292.gif
web/js/xinha/plugins/InsertSmiley/smileys/0293.gif
web/js/xinha/plugins/InsertSmiley/smileys/0294.gif
web/js/xinha/plugins/InsertSmiley/smileys/0295.gif
web/js/xinha/plugins/InsertSmiley/smileys/0296.gif
web/js/xinha/plugins/InsertSmiley/smileys/0297.gif
web/js/xinha/plugins/InsertSmiley/smileys/0298.gif
web/js/xinha/plugins/InsertSmiley/smileys/0299.gif
web/js/xinha/plugins/InsertSmiley/smileys/0300.gif
web/js/xinha/plugins/InsertSmiley/smileys/0301.gif
web/js/xinha/plugins/InsertSmiley/smileys/0302.gif
web/js/xinha/plugins/InsertSmiley/smileys/0303.gif
web/js/xinha/plugins/InsertSmiley/smileys/0304.gif
web/js/xinha/plugins/InsertSmiley/smileys/0305.gif
web/js/xinha/plugins/InsertSmiley/smileys/0306.gif
web/js/xinha/plugins/InsertSmiley/smileys/0307.gif
web/js/xinha/plugins/InsertSmiley/smileys/0308.gif
web/js/xinha/plugins/InsertSmiley/smileys/0309.gif
web/js/xinha/plugins/InsertSmiley/smileys/0310.gif
web/js/xinha/plugins/InsertSmiley/smileys/0311.gif
web/js/xinha/plugins/InsertSmiley/smileys/0312.gif
web/js/xinha/plugins/InsertSmiley/smileys/0313.gif
web/js/xinha/plugins/InsertSmiley/smileys/0314.gif
web/js/xinha/plugins/InsertSmiley/smileys/0315.gif
web/js/xinha/plugins/InsertSmiley/smileys/0316.gif
web/js/xinha/plugins/InsertSmiley/smileys/0317.gif
web/js/xinha/plugins/InsertSmiley/smileys/0318.gif
web/js/xinha/plugins/InsertSmiley/smileys/0319.gif
web/js/xinha/plugins/InsertSmiley/smileys/0320.gif
web/js/xinha/plugins/InsertSmiley/smileys/0321.gif
web/js/xinha/plugins/InsertSmiley/smileys/0322.gif
web/js/xinha/plugins/InsertSmiley/smileys/0323.gif
web/js/xinha/plugins/InsertSmiley/smileys/0324.gif
web/js/xinha/plugins/InsertSmiley/smileys/0325.gif
web/js/xinha/plugins/InsertSmiley/smileys/0326.gif
web/js/xinha/plugins/InsertSmiley/smileys/0327.gif
web/js/xinha/plugins/InsertSmiley/smileys/0328.gif
web/js/xinha/plugins/InsertSmiley/smileys/0329.gif
web/js/xinha/plugins/InsertSmiley/smileys/0330.gif
web/js/xinha/plugins/InsertSmiley/smileys/0331.gif
web/js/xinha/plugins/InsertSmiley/smileys/0332.gif
web/js/xinha/plugins/InsertSmiley/smileys/0333.gif
web/js/xinha/plugins/InsertSmiley/smileys/0334.gif
web/js/xinha/plugins/InsertSmiley/smileys/0335.gif
web/js/xinha/plugins/InsertSmiley/smileys/0336.gif
web/js/xinha/plugins/InsertSmiley/smileys/0337.gif
web/js/xinha/plugins/InsertSmiley/smileys/0338.gif
web/js/xinha/plugins/InsertSmiley/smileys/0339.gif
web/js/xinha/plugins/InsertSmiley/smileys/0340.gif
web/js/xinha/plugins/InsertSmiley/smileys/0341.gif
web/js/xinha/plugins/InsertSmiley/smileys/0342.gif
web/js/xinha/plugins/InsertSmiley/smileys/0343.gif
web/js/xinha/plugins/InsertSmiley/smileys/0344.gif
web/js/xinha/plugins/InsertSmiley/smileys/0345.gif
web/js/xinha/plugins/InsertSmiley/smileys/0346.gif
web/js/xinha/plugins/InsertSmiley/smileys/0347.gif
web/js/xinha/plugins/InsertSmiley/smileys/0348.gif
web/js/xinha/plugins/InsertSmiley/smileys/0349.gif
web/js/xinha/plugins/InsertSmiley/smileys/0350.gif
web/js/xinha/plugins/InsertSmiley/smileys/0351.gif
web/js/xinha/plugins/InsertSmiley/smileys/0352.gif
web/js/xinha/plugins/InsertSmiley/smileys/0353.gif
web/js/xinha/plugins/InsertSmiley/smileys/0354.gif
web/js/xinha/plugins/InsertSmiley/smileys/0355.gif
web/js/xinha/plugins/InsertSmiley/smileys/0356.gif
web/js/xinha/plugins/InsertSmiley/smileys/0357.gif
web/js/xinha/plugins/InsertSmiley/smileys/0358.gif
web/js/xinha/plugins/InsertSmiley/smileys/0359.gif
web/js/xinha/plugins/InsertSmiley/smileys/0360.gif
web/js/xinha/plugins/InsertSmiley/smileys/0361.gif
web/js/xinha/plugins/InsertSmiley/smileys/0362.gif
web/js/xinha/plugins/InsertSmiley/smileys/0363.gif
web/js/xinha/plugins/InsertSmiley/smileys/0364.gif
web/js/xinha/plugins/InsertSmiley/smileys/0365.gif
web/js/xinha/plugins/InsertSmiley/smileys/0366.gif
web/js/xinha/plugins/InsertSmiley/smileys/0367.gif
web/js/xinha/plugins/InsertSmiley/smileys/0368.gif
web/js/xinha/plugins/InsertSmiley/smileys/0369.gif
web/js/xinha/plugins/InsertSmiley/smileys/0370.gif
web/js/xinha/plugins/InsertSmiley/smileys/0371.gif
web/js/xinha/plugins/InsertSmiley/smileys/0372.gif
web/js/xinha/plugins/InsertSmiley/smileys/0373.gif
web/js/xinha/plugins/InsertSmiley/smileys/0374.gif
web/js/xinha/plugins/InsertSmiley/smileys/0375.gif
web/js/xinha/plugins/InsertSmiley/smileys/0376.gif
web/js/xinha/plugins/InsertSmiley/smileys/0377.gif
web/js/xinha/plugins/InsertSmiley/smileys/0378.gif
web/js/xinha/plugins/InsertSmiley/smileys/0379.gif
web/js/xinha/plugins/InsertSmiley/smileys/0380.gif
web/js/xinha/plugins/InsertSmiley/smileys/0381.gif
web/js/xinha/plugins/InsertSmiley/smileys/0382.gif
web/js/xinha/plugins/InsertSmiley/smileys/0383.gif
web/js/xinha/plugins/InsertSmiley/smileys/0384.gif
web/js/xinha/plugins/InsertSmiley/smileys/0385.gif
web/js/xinha/plugins/InsertSmiley/smileys/0386.gif
web/js/xinha/plugins/InsertSmiley/smileys/0387.gif
web/js/xinha/plugins/InsertSmiley/smileys/0388.gif
web/js/xinha/plugins/InsertSmiley/smileys/0389.gif
web/js/xinha/plugins/InsertSmiley/smileys/0390.gif
web/js/xinha/plugins/InsertSmiley/smileys/0391.gif
web/js/xinha/plugins/InsertSmiley/smileys/0392.gif
web/js/xinha/plugins/InsertSmiley/smileys/0393.gif
web/js/xinha/plugins/InsertSmiley/smileys/0394.gif
web/js/xinha/plugins/InsertSmiley/smileys/0395.gif
web/js/xinha/plugins/InsertSmiley/smileys/0396.gif
web/js/xinha/plugins/InsertSmiley/smileys/0397.gif
web/js/xinha/plugins/InsertSmiley/smileys/0398.gif
web/js/xinha/plugins/InsertSmiley/smileys/0399.gif
web/js/xinha/plugins/InsertSmiley/smileys/0400.gif
web/js/xinha/plugins/InsertSmiley/smileys/0401.gif
web/js/xinha/plugins/InsertSmiley/smileys/0402.gif
web/js/xinha/plugins/InsertSmiley/smileys/0403.gif
web/js/xinha/plugins/InsertSmiley/smileys/0404.gif
web/js/xinha/plugins/InsertSmiley/smileys/0405.gif
web/js/xinha/plugins/InsertSmiley/smileys/0406.gif
web/js/xinha/plugins/InsertSmiley/smileys/0407.gif
web/js/xinha/plugins/InsertSmiley/smileys/0408.gif
web/js/xinha/plugins/InsertSmiley/smileys/0409.gif
web/js/xinha/plugins/InsertSmiley/smileys/0410.gif
web/js/xinha/plugins/InsertSmiley/smileys/0411.gif
web/js/xinha/plugins/InsertSmiley/smileys/0412.gif
web/js/xinha/plugins/InsertSmiley/smileys/0413.gif
web/js/xinha/plugins/InsertSmiley/smileys/0414.gif
web/js/xinha/plugins/InsertSmiley/smileys/0415.gif
web/js/xinha/plugins/InsertSmiley/smileys/0416.gif
web/js/xinha/plugins/InsertSmiley/smileys/0417.gif
web/js/xinha/plugins/InsertSmiley/smileys/0418.gif
web/js/xinha/plugins/InsertSmiley/smileys/0419.gif
web/js/xinha/plugins/InsertSmiley/smileys/0420.gif
web/js/xinha/plugins/InsertSmiley/smileys/0421.gif
web/js/xinha/plugins/InsertSmiley/smileys/0422.gif
web/js/xinha/plugins/InsertSmiley/smileys/0423.gif
web/js/xinha/plugins/InsertSmiley/smileys/0424.gif
web/js/xinha/plugins/InsertSmiley/smileys/0425.gif
web/js/xinha/plugins/InsertSmiley/smileys/0426.gif
web/js/xinha/plugins/InsertSmiley/smileys/0427.gif
web/js/xinha/plugins/InsertSmiley/smileys/0428.gif
web/js/xinha/plugins/InsertSmiley/smileys/0429.gif
web/js/xinha/plugins/InsertSmiley/smileys/0430.gif
web/js/xinha/plugins/InsertSmiley/smileys/0431.gif
web/js/xinha/plugins/InsertSmiley/smileys/0432.gif
web/js/xinha/plugins/InsertSmiley/smileys/0433.gif
web/js/xinha/plugins/InsertSmiley/smileys/0434.gif
web/js/xinha/plugins/InsertSmiley/smileys/0435.gif
web/js/xinha/plugins/InsertSmiley/smileys/0436.gif
web/js/xinha/plugins/InsertSmiley/smileys/0437.gif
web/js/xinha/plugins/InsertSmiley/smileys/0438.gif
web/js/xinha/plugins/InsertSmiley/smileys/0439.gif
web/js/xinha/plugins/InsertSmiley/smileys/0440.gif
web/js/xinha/plugins/InsertSmiley/smileys/0441.gif
web/js/xinha/plugins/InsertSmiley/smileys/0442.gif
web/js/xinha/plugins/InsertSmiley/smileys/0443.gif
web/js/xinha/plugins/InsertSmiley/smileys/0444.gif
web/js/xinha/plugins/InsertSmiley/smileys/0445.gif
web/js/xinha/plugins/InsertSmiley/smileys/0446.gif
web/js/xinha/plugins/InsertSmiley/smileys/0447.gif
web/js/xinha/plugins/InsertSmiley/smileys/0448.gif
web/js/xinha/plugins/InsertSmiley/smileys/0449.gif
web/js/xinha/plugins/InsertSmiley/smileys/0450.gif
web/js/xinha/plugins/InsertSmiley/smileys/0451.gif
web/js/xinha/plugins/InsertSmiley/smileys/0452.gif
web/js/xinha/plugins/InsertSmiley/smileys/0453.gif
web/js/xinha/plugins/InsertSmiley/smileys/0454.gif
web/js/xinha/plugins/InsertSmiley/smileys/0455.gif
web/js/xinha/plugins/InsertSmiley/smileys/0456.gif
web/js/xinha/plugins/InsertSmiley/smileys/0457.gif
web/js/xinha/plugins/InsertSmiley/smileys/0458.gif
web/js/xinha/plugins/InsertSmiley/smileys/0459.gif
web/js/xinha/plugins/InsertSmiley/smileys/0460.gif
web/js/xinha/plugins/InsertSmiley/smileys/0461.gif
web/js/xinha/plugins/InsertSmiley/smileys/0462.gif
web/js/xinha/plugins/InsertSmiley/smileys/0463.gif
web/js/xinha/plugins/InsertSmiley/smileys/0464.gif
web/js/xinha/plugins/InsertSmiley/smileys/0465.gif
web/js/xinha/plugins/InsertSmiley/smileys/0466.gif
web/js/xinha/plugins/InsertSmiley/smileys/0467.gif
web/js/xinha/plugins/InsertSmiley/smileys/0468.gif
web/js/xinha/plugins/InsertSmiley/smileys/0469.gif
web/js/xinha/plugins/InsertSmiley/smileys/0470.gif
web/js/xinha/plugins/InsertSmiley/smileys/0471.gif
web/js/xinha/plugins/InsertSmiley/smileys/0472.gif
web/js/xinha/plugins/InsertSmiley/smileys/0473.gif
web/js/xinha/plugins/InsertSmiley/smileys/0474.gif
web/js/xinha/plugins/InsertSmiley/smileys/0475.gif
web/js/xinha/plugins/InsertSmiley/smileys/0476.gif
web/js/xinha/plugins/InsertSmiley/smileys/0477.gif
web/js/xinha/plugins/InsertSmiley/smileys/0478.gif
web/js/xinha/plugins/InsertSmiley/smileys/0479.gif
web/js/xinha/plugins/InsertSmiley/smileys/0480.gif
web/js/xinha/plugins/InsertSmiley/smileys/0481.gif
web/js/xinha/plugins/InsertSmiley/smileys/0482.gif
web/js/xinha/plugins/InsertSmiley/smileys/0483.gif
web/js/xinha/plugins/InsertSmiley/smileys/0484.gif
web/js/xinha/plugins/InsertSmiley/smileys/0485.gif
web/js/xinha/plugins/InsertSmiley/smileys/0486.gif
web/js/xinha/plugins/InsertSmiley/smileys/0487.gif
web/js/xinha/plugins/InsertSmiley/smileys/0488.gif
web/js/xinha/plugins/InsertSmiley/smileys/0489.gif
web/js/xinha/plugins/InsertSmiley/smileys/0490.gif
web/js/xinha/plugins/InsertSmiley/smileys/0491.gif
web/js/xinha/plugins/InsertSmiley/smileys/0492.gif
web/js/xinha/plugins/InsertSmiley/smileys/0493.gif
web/js/xinha/plugins/InsertSmiley/smileys/0494.gif
web/js/xinha/plugins/InsertSmiley/smileys/0495.gif
web/js/xinha/plugins/InsertSmiley/smileys/0496.gif
web/js/xinha/plugins/InsertSmiley/smileys/0497.gif
web/js/xinha/plugins/InsertSmiley/smileys/0498.gif
web/js/xinha/plugins/InsertSmiley/smileys/0499.gif
web/js/xinha/plugins/InsertSmiley/smileys/0500.gif
web/js/xinha/plugins/InsertSmiley/smileys/0501.gif
web/js/xinha/plugins/InsertSmiley/smileys/0502.gif
web/js/xinha/plugins/InsertSmiley/smileys/0503.gif
web/js/xinha/plugins/InsertSmiley/smileys/0504.gif
web/js/xinha/plugins/InsertSmiley/smileys/0505.gif
web/js/xinha/plugins/InsertSmiley/smileys/0506.gif
web/js/xinha/plugins/InsertSmiley/smileys/0507.gif
web/js/xinha/plugins/InsertSmiley/smileys/0508.gif
web/js/xinha/plugins/InsertSmiley/smileys/0509.gif
web/js/xinha/plugins/InsertSmiley/smileys/0510.gif
web/js/xinha/plugins/InsertSmiley/smileys/0511.gif
web/js/xinha/plugins/InsertSmiley/smileys/0512.gif
web/js/xinha/plugins/InsertSmiley/smileys/0513.gif
web/js/xinha/plugins/InsertSmiley/smileys/0514.gif
web/js/xinha/plugins/InsertSmiley/smileys/0515.gif
web/js/xinha/plugins/InsertSmiley/smileys/0516.gif
web/js/xinha/plugins/InsertSmiley/smileys/0517.gif
web/js/xinha/plugins/InsertSmiley/smileys/0518.gif
web/js/xinha/plugins/InsertSmiley/smileys/0519.gif
web/js/xinha/plugins/InsertSmiley/smileys/0520.gif
web/js/xinha/plugins/InsertSmiley/smileys/0521.gif
web/js/xinha/plugins/InsertSmiley/smileys/0522.gif
web/js/xinha/plugins/InsertSmiley/smileys/0523.gif
web/js/xinha/plugins/InsertSmiley/smileys/0524.gif
web/js/xinha/plugins/InsertSmiley/smileys/0525.gif
web/js/xinha/plugins/InsertSmiley/smileys/0526.gif
web/js/xinha/plugins/InsertSmiley/smileys/0527.gif
web/js/xinha/plugins/InsertSmiley/smileys/0528.gif
web/js/xinha/plugins/InsertSmiley/smileys/0529.gif
web/js/xinha/plugins/InsertSmiley/smileys/0530.gif
web/js/xinha/plugins/InsertSmiley/smileys/0531.gif
web/js/xinha/plugins/InsertSmiley/smileys/0532.gif
web/js/xinha/plugins/InsertSmiley/smileys/0533.gif
web/js/xinha/plugins/InsertSmiley/smileys/0534.gif
web/js/xinha/plugins/InsertSmiley/smileys/0535.gif
web/js/xinha/plugins/InsertSmiley/smileys/0536.gif
web/js/xinha/plugins/InsertSmiley/smileys/0537.gif
web/js/xinha/plugins/InsertSmiley/smileys/0538.gif
web/js/xinha/plugins/InsertSmiley/smileys/0539.gif
web/js/xinha/plugins/InsertSmiley/smileys/0540.gif
web/js/xinha/plugins/InsertSmiley/smileys/0541.gif
web/js/xinha/plugins/InsertSmiley/smileys/0542.gif
web/js/xinha/plugins/InsertSmiley/smileys/0543.gif
web/js/xinha/plugins/InsertSmiley/smileys/0544.gif
web/js/xinha/plugins/InsertSmiley/smileys/0545.gif
web/js/xinha/plugins/InsertSmiley/smileys/0546.gif
web/js/xinha/plugins/InsertSmiley/smileys/0547.gif
web/js/xinha/plugins/InsertSmiley/smileys/0548.gif
web/js/xinha/plugins/InsertSmiley/smileys/0549.gif
web/js/xinha/plugins/InsertSmiley/smileys/0550.gif
web/js/xinha/plugins/InsertSmiley/smileys/0551.gif
web/js/xinha/plugins/InsertSmiley/smileys/0552.gif
web/js/xinha/plugins/InsertSmiley/smileys/0553.gif
web/js/xinha/plugins/InsertSmiley/smileys/0554.gif
web/js/xinha/plugins/InsertSmiley/smileys/0555.gif
web/js/xinha/plugins/InsertSmiley/smileys/0556.gif
web/js/xinha/plugins/InsertSmiley/smileys/0557.gif
web/js/xinha/plugins/InsertSmiley/smileys/0558.gif
web/js/xinha/plugins/InsertSmiley/smileys/0559.gif
web/js/xinha/plugins/InsertSmiley/smileys/0560.gif
web/js/xinha/plugins/InsertSmiley/smileys/0561.gif
web/js/xinha/plugins/InsertSmiley/smileys/0562.gif
web/js/xinha/plugins/InsertSmiley/smileys/0563.gif
web/js/xinha/plugins/InsertSmiley/smileys/0564.gif
web/js/xinha/plugins/InsertSmiley/smileys/0565.gif
web/js/xinha/plugins/InsertSmiley/smileys/0566.gif
web/js/xinha/plugins/InsertSmiley/smileys/0567.gif
web/js/xinha/plugins/InsertSmiley/smileys/0568.gif
web/js/xinha/plugins/InsertSmiley/smileys/0569.gif
web/js/xinha/plugins/InsertSmiley/smileys/0570.gif
web/js/xinha/plugins/InsertSmiley/smileys/0571.gif
web/js/xinha/plugins/InsertSmiley/smileys/0572.gif
web/js/xinha/plugins/InsertSmiley/smileys/0573.gif
web/js/xinha/plugins/InsertSmiley/smileys/0574.gif
web/js/xinha/plugins/InsertSmiley/smileys/0575.gif
web/js/xinha/plugins/InsertSmiley/smileys/0576.gif
web/js/xinha/plugins/InsertSmiley/smileys/0577.gif
web/js/xinha/plugins/InsertSmiley/smileys/0578.gif
web/js/xinha/plugins/InsertSmiley/smileys/0579.gif
web/js/xinha/plugins/InsertSmiley/smileys/0580.gif
web/js/xinha/plugins/InsertSnippet/InsertSnippet.css
web/js/xinha/plugins/InsertSnippet/img/ed_snippet.gif
web/js/xinha/plugins/InsertSnippet/insert-snippet.js
web/js/xinha/plugins/InsertSnippet/lang/de.js
web/js/xinha/plugins/InsertSnippet/popups/insertsnippet.html
web/js/xinha/plugins/InsertSnippet/snippets.html
web/js/xinha/plugins/InsertSnippet/snippets.js
web/js/xinha/plugins/InsertSnippet/snippets.php
web/js/xinha/plugins/InsertWords/insert-words.js
web/js/xinha/plugins/LangMarks/img/el.gif
web/js/xinha/plugins/LangMarks/img/en.gif
web/js/xinha/plugins/LangMarks/img/fr.gif
web/js/xinha/plugins/LangMarks/img/la.gif
web/js/xinha/plugins/LangMarks/lang-marks.css
web/js/xinha/plugins/LangMarks/lang-marks.js
web/js/xinha/plugins/LangMarks/lang/de.js
web/js/xinha/plugins/LangMarks/lang/fr.js
web/js/xinha/plugins/LangMarks/lang/no.js
web/js/xinha/plugins/Linker/dTree/api.html
web/js/xinha/plugins/Linker/dTree/dtree.css
web/js/xinha/plugins/Linker/dTree/dtree.js
web/js/xinha/plugins/Linker/dTree/example01.html
web/js/xinha/plugins/Linker/dTree/img/base.gif
web/js/xinha/plugins/Linker/dTree/img/cd.gif
web/js/xinha/plugins/Linker/dTree/img/copy.gif
web/js/xinha/plugins/Linker/dTree/img/empty.gif
web/js/xinha/plugins/Linker/dTree/img/folder.gif
web/js/xinha/plugins/Linker/dTree/img/folderopen.gif
web/js/xinha/plugins/Linker/dTree/img/globe.gif
web/js/xinha/plugins/Linker/dTree/img/imgfolder.gif
web/js/xinha/plugins/Linker/dTree/img/join.gif
web/js/xinha/plugins/Linker/dTree/img/joinbottom.gif
web/js/xinha/plugins/Linker/dTree/img/line.gif
web/js/xinha/plugins/Linker/dTree/img/minus.gif
web/js/xinha/plugins/Linker/dTree/img/minusbottom.gif
web/js/xinha/plugins/Linker/dTree/img/move.gif
web/js/xinha/plugins/Linker/dTree/img/musicfolder.gif
web/js/xinha/plugins/Linker/dTree/img/nolines_minus.gif
web/js/xinha/plugins/Linker/dTree/img/nolines_plus.gif
web/js/xinha/plugins/Linker/dTree/img/offline.gif
web/js/xinha/plugins/Linker/dTree/img/offline.png
web/js/xinha/plugins/Linker/dTree/img/page.gif
web/js/xinha/plugins/Linker/dTree/img/plus.gif
web/js/xinha/plugins/Linker/dTree/img/plusbottom.gif
web/js/xinha/plugins/Linker/dTree/img/question.gif
web/js/xinha/plugins/Linker/dTree/img/trash.gif
web/js/xinha/plugins/Linker/dialog.html
web/js/xinha/plugins/Linker/lang/de.js
web/js/xinha/plugins/Linker/lang/fr.js
web/js/xinha/plugins/Linker/lang/no.js
web/js/xinha/plugins/Linker/lang/pl.js
web/js/xinha/plugins/Linker/linker.js
web/js/xinha/plugins/Linker/scan.php
web/js/xinha/plugins/ListType/ListType.css
web/js/xinha/plugins/ListType/img/circle.png
web/js/xinha/plugins/ListType/img/decimal.png
web/js/xinha/plugins/ListType/img/disc.png
web/js/xinha/plugins/ListType/img/lower-alpha.png
web/js/xinha/plugins/ListType/img/lower-roman.png
web/js/xinha/plugins/ListType/img/none.png
web/js/xinha/plugins/ListType/img/square.png
web/js/xinha/plugins/ListType/img/upper-alpha.png
web/js/xinha/plugins/ListType/img/upper-roman.png
web/js/xinha/plugins/ListType/lang/de.js
web/js/xinha/plugins/ListType/lang/fr.js
web/js/xinha/plugins/ListType/lang/nl.js
web/js/xinha/plugins/ListType/lang/no.js
web/js/xinha/plugins/ListType/lang/pl.js
web/js/xinha/plugins/ListType/lang/ru.js
web/js/xinha/plugins/ListType/list-type.js
web/js/xinha/plugins/NoteServer/img/note.gif
web/js/xinha/plugins/NoteServer/lang/de.js
web/js/xinha/plugins/NoteServer/lang/fr.js
web/js/xinha/plugins/NoteServer/lang/no.js
web/js/xinha/plugins/NoteServer/note-server.js
web/js/xinha/plugins/NoteServer/popups/codenote.html
web/js/xinha/plugins/PasteText/img/ed_paste_text.gif
web/js/xinha/plugins/PasteText/lang/de.js
web/js/xinha/plugins/PasteText/lang/es.js
web/js/xinha/plugins/PasteText/lang/fr.js
web/js/xinha/plugins/PasteText/lang/no.js
web/js/xinha/plugins/PasteText/lang/pl.js
web/js/xinha/plugins/PasteText/paste-text.js
web/js/xinha/plugins/PasteText/popups/paste_text.html
web/js/xinha/plugins/QuickTag/img/ed_quicktag.gif
web/js/xinha/plugins/QuickTag/lang/de.js
web/js/xinha/plugins/QuickTag/lang/fr.js
web/js/xinha/plugins/QuickTag/lang/no.js
web/js/xinha/plugins/QuickTag/lang/pl.js
web/js/xinha/plugins/QuickTag/lang/pt_br.js
web/js/xinha/plugins/QuickTag/popups/quicktag.html
web/js/xinha/plugins/QuickTag/quick-tag.js
web/js/xinha/plugins/QuickTag/tag-lib.js
web/js/xinha/plugins/SpellChecker/README
web/js/xinha/plugins/SpellChecker/aspell_setup.php
web/js/xinha/plugins/SpellChecker/img/he-spell-check.gif
web/js/xinha/plugins/SpellChecker/img/spell-check.gif
web/js/xinha/plugins/SpellChecker/lang/cz.js
web/js/xinha/plugins/SpellChecker/lang/da.js
web/js/xinha/plugins/SpellChecker/lang/de.js
web/js/xinha/plugins/SpellChecker/lang/fr.js
web/js/xinha/plugins/SpellChecker/lang/he.js
web/js/xinha/plugins/SpellChecker/lang/hu.js
web/js/xinha/plugins/SpellChecker/lang/nl.js
web/js/xinha/plugins/SpellChecker/lang/no.js
web/js/xinha/plugins/SpellChecker/lang/ro.js
web/js/xinha/plugins/SpellChecker/personal_dicts/.keep
web/js/xinha/plugins/SpellChecker/readme-tech.html
web/js/xinha/plugins/SpellChecker/spell-check-logic.cgi
web/js/xinha/plugins/SpellChecker/spell-check-logic.php
web/js/xinha/plugins/SpellChecker/spell-check-savedicts.php
web/js/xinha/plugins/SpellChecker/spell-check-style.css
web/js/xinha/plugins/SpellChecker/spell-check-ui.html
web/js/xinha/plugins/SpellChecker/spell-check-ui.js
web/js/xinha/plugins/SpellChecker/spell-checker.js
web/js/xinha/plugins/Stylist/lang/de.js
web/js/xinha/plugins/Stylist/lang/fr.js
web/js/xinha/plugins/Stylist/lang/no.js
web/js/xinha/plugins/Stylist/lang/pl.js
web/js/xinha/plugins/Stylist/stylist.js
web/js/xinha/plugins/SuperClean/dialog.html
web/js/xinha/plugins/SuperClean/filters/paragraph.js
web/js/xinha/plugins/SuperClean/filters/word.js
web/js/xinha/plugins/SuperClean/img/ed_superclean.gif
web/js/xinha/plugins/SuperClean/lang/de.js
web/js/xinha/plugins/SuperClean/lang/fr.js
web/js/xinha/plugins/SuperClean/lang/no.js
web/js/xinha/plugins/SuperClean/super-clean.js
web/js/xinha/plugins/SuperClean/tidy.php
web/js/xinha/plugins/TableOperations/img/cell-delete.gif
web/js/xinha/plugins/TableOperations/img/cell-insert-after.gif
web/js/xinha/plugins/TableOperations/img/cell-insert-before.gif
web/js/xinha/plugins/TableOperations/img/cell-merge.gif
web/js/xinha/plugins/TableOperations/img/cell-prop.gif
web/js/xinha/plugins/TableOperations/img/cell-split.gif
web/js/xinha/plugins/TableOperations/img/col-delete.gif
web/js/xinha/plugins/TableOperations/img/col-insert-after.gif
web/js/xinha/plugins/TableOperations/img/col-insert-before.gif
web/js/xinha/plugins/TableOperations/img/col-split.gif
web/js/xinha/plugins/TableOperations/img/row-delete.gif
web/js/xinha/plugins/TableOperations/img/row-insert-above.gif
web/js/xinha/plugins/TableOperations/img/row-insert-under.gif
web/js/xinha/plugins/TableOperations/img/row-prop.gif
web/js/xinha/plugins/TableOperations/img/row-split.gif
web/js/xinha/plugins/TableOperations/img/table-prop.gif
web/js/xinha/plugins/TableOperations/lang/cz.js
web/js/xinha/plugins/TableOperations/lang/da.js
web/js/xinha/plugins/TableOperations/lang/de.js
web/js/xinha/plugins/TableOperations/lang/el.js
web/js/xinha/plugins/TableOperations/lang/fi.js
web/js/xinha/plugins/TableOperations/lang/fr.js
web/js/xinha/plugins/TableOperations/lang/he.js
web/js/xinha/plugins/TableOperations/lang/it.js
web/js/xinha/plugins/TableOperations/lang/nl.js
web/js/xinha/plugins/TableOperations/lang/no.js
web/js/xinha/plugins/TableOperations/lang/pl.js
web/js/xinha/plugins/TableOperations/lang/ro.js
web/js/xinha/plugins/TableOperations/lang/ru.js
web/js/xinha/plugins/TableOperations/popups/.keep
web/js/xinha/plugins/TableOperations/table-operations.js
web/js/xinha/plugins/Template/img/ed_template.gif
web/js/xinha/plugins/Template/img/layout_01.gif
web/js/xinha/plugins/Template/img/layout_02.gif
web/js/xinha/plugins/Template/img/layout_03.gif
web/js/xinha/plugins/Template/lang/de.js
web/js/xinha/plugins/Template/lang/fr.js
web/js/xinha/plugins/Template/lang/it.js
web/js/xinha/plugins/Template/lang/no.js
web/js/xinha/plugins/Template/popups/template.html
web/js/xinha/plugins/Template/template.css
web/js/xinha/plugins/Template/template.js
web/js/xinha/plugins/UnFormat/img/unformat.gif
web/js/xinha/plugins/UnFormat/lang/de.js
web/js/xinha/plugins/UnFormat/lang/fr.js
web/js/xinha/plugins/UnFormat/lang/nl.js
web/js/xinha/plugins/UnFormat/lang/no.js
web/js/xinha/plugins/UnFormat/popups/unformat.html
web/js/xinha/plugins/UnFormat/un-format.js
web/js/xinha/popupdiv.js
web/js/xinha/popups/about.html
web/js/xinha/popups/blank.html
web/js/xinha/popups/color_picker.js
web/js/xinha/popups/custom2.html
web/js/xinha/popups/editor_help.html
web/js/xinha/popups/insert_image.html
web/js/xinha/popups/insert_table.html
web/js/xinha/popups/link.html
web/js/xinha/popups/old_insert_image.html
web/js/xinha/popups/popup.css
web/js/xinha/popups/popup.js
web/js/xinha/popups/select_color.html
web/js/xinha/popupwin.js
web/js/xinha/skins/blue-look/button-background.png
web/js/xinha/skins/blue-look/separator.gif
web/js/xinha/skins/blue-look/skin.css
web/js/xinha/skins/blue-metallic/button-background.png
web/js/xinha/skins/blue-metallic/separator.gif
web/js/xinha/skins/blue-metallic/skin.css
web/js/xinha/skins/green-look/button-background.gif
web/js/xinha/skins/green-look/button-background.png
web/js/xinha/skins/green-look/separator.gif
web/js/xinha/skins/green-look/skin.css
web/js/xinha/skins/inditreuse/README
web/js/xinha/skins/inditreuse/back.png
web/js/xinha/skins/inditreuse/button-background.png
web/js/xinha/skins/inditreuse/hover.png
web/js/xinha/skins/inditreuse/selected.png
web/js/xinha/skins/inditreuse/separator.png
web/js/xinha/skins/inditreuse/skin.css
web/js/xinha/skins/titan/README
web/js/xinha/skins/titan/back.png
web/js/xinha/skins/titan/button-background.png
web/js/xinha/skins/titan/hover.png
web/js/xinha/skins/titan/selected.png
web/js/xinha/skins/titan/separator.png
web/js/xinha/skins/titan/skin.css
web/js/xinha/skins/xp-blue/back.png
web/js/xinha/skins/xp-blue/button-background.png
web/js/xinha/skins/xp-blue/hover.png
web/js/xinha/skins/xp-blue/selected.png
web/js/xinha/skins/xp-blue/separator.png
web/js/xinha/skins/xp-blue/skin.css
web/js/xinha/skins/xp-green/back.png
web/js/xinha/skins/xp-green/button-background.png
web/js/xinha/skins/xp-green/hover.png
web/js/xinha/skins/xp-green/selected.png
web/js/xinha/skins/xp-green/separator.png
web/js/xinha/skins/xp-green/skin.css
--- a/.hgsigs	Tue Feb 25 10:11:55 2014 +1200
+++ b/.hgsigs	Wed Feb 26 15:15:03 2014 +0100
@@ -141,4 +141,6 @@
 4c222ccbbea79a4343b1ff1729106becebebbc39 0 iEYEABECAAYFAlKwPmcACgkQCX/oGf+2qkP0awCfVBWE5p7hLNtnbzLL60SS5+ZsrogAn1d7xhYIm/nJ03Jlqs1jXg0iJcgM
 9723c0915b480c5791da82740bb595ab62f960cb 0 iEYEABECAAYFAlLM7asACgkQCX/oGf+2qkOiVACggMpQM1gkVjvb+ngSt/OtvN71StMAoI3WzbIJHkJPyw9TgkhZIDHqKBN6
 eb8e78cfd919a9685a7c62d95dea0c33da5cd020 0 iEYEABECAAYFAlLfapIACgkQCX/oGf+2qkOsgQCfZ++nSoqIqaQLLAq8xjW7qzJG3pUAn0+PMbOjJt6kpXwYS8llobEit6Pw
+dabb8fba63b9659c127420f07461871b3c9bebda 0 iEYEABECAAYFAlL8P1gACgkQCX/oGf+2qkOoYwCg/3/+oc1NxA/d8WSRpVMs0TYNOQwAoKUC5zxZqvJk+LivRSN/+eskflS7
 2cbbd8417ae97c721014374b56300f9359801fc2 0 iEYEABECAAYFAlLX0sMACgkQCX/oGf+2qkPBDgCeOEYN+sAUu4baZ1tz3jNaubocaCcAoL/oSf0PxmUybuQg3kMSTINTsbOt
+43f6f77b25a9c7d51084945606d9047edc330fd9 0 iEYEABECAAYFAlL8iUMACgkQCX/oGf+2qkNl7ACfSjVPsngbBzCPO8LvR265DeT4c/QAni8NT/G2mfMPQIToawozPiOKNtQl
--- a/.hgtags	Tue Feb 25 10:11:55 2014 +1200
+++ b/.hgtags	Wed Feb 26 15:15:03 2014 +0100
@@ -152,4 +152,6 @@
 d58f931280521ed35a3bfc7d7fcaa60186489ba2 3.0MP30
 fc12bbe0a94fd017c287256ed86af3bc22a90544 3.0MP30.1
 80961289f4cd77842d94594c7e3b05be7fbcb845 3.0MP30.2
+305302e510c295adf7ac53425f45a64a8bb6f2b2 3.0MP30.3
 e6661b2604e820c2df1269029e688e49d611a1e7 3.0MP31
+510340c73c5073cf20afd52a02e411cebdc017f6 3.0MP31.1
--- a/legal/Licensing.txt	Tue Feb 25 10:11:55 2014 +1200
+++ b/legal/Licensing.txt	Wed Feb 26 15:15:03 2014 +0100
@@ -129,11 +129,6 @@
 # xstream-1.3.1.jar
 Under a modified BSD license available at http://xstream.codehaus.org/license.html
 
-# NOTE: This library is planned to be remove during (!) the 3.0 life-cycle (see README also in web/js/xinja)
-# Xinha files in web/js/xinha/
-All filess available under the htmlarea license, available at
-http://xinha.python-hosting.com/wiki/Licence
-
 # Dojo Foundation javascripts in web/js/dojo/
 All files under the Academic Free License 2.1 (license available at
 http://opensource.org/licenses/afl-2.1.php)
Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateTransactionBPExchangeRateData.class has changed
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_FINACC_TRAN_CHECK_TRG.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_FINACC_TRAN_CHECK_TRG.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -30,8 +30,7 @@
   END IF;
 
   IF (UPDATING) THEN
-    IF(:OLD.PROCESSED='Y' AND ((COALESCE(:OLD.AD_ORG_ID, '0') <> COALESCE(:NEW.AD_ORG_ID, '0'))
-      OR(COALESCE(:OLD.C_CURRENCY_ID, '0') <> COALESCE(:NEW.C_CURRENCY_ID, '0'))
+    IF(:OLD.PROCESSED='Y' AND ((COALESCE(:OLD.C_CURRENCY_ID, '0') <> COALESCE(:NEW.C_CURRENCY_ID, '0'))
       OR(COALESCE(:OLD.FIN_FINANCIAL_ACCOUNT_ID, '0') <> COALESCE(:NEW.FIN_FINANCIAL_ACCOUNT_ID, '0'))
       OR(COALESCE(:OLD.LINE, 0) <> COALESCE(:NEW.LINE, 0))
       OR(COALESCE(:OLD.FIN_PAYMENT_ID, '0') <> COALESCE(:NEW.FIN_PAYMENT_ID, '0'))
@@ -42,6 +41,7 @@
       RAISE_APPLICATION_ERROR(-20000, '@20501@');
     END IF;
     IF((COALESCE(:OLD.DATEACCT, v_DateNull) <> COALESCE(:NEW.DATEACCT, v_DateNull))
+      OR(COALESCE(:OLD.AD_ORG_ID, '0') <> COALESCE(:NEW.AD_ORG_ID, '0'))
       OR(COALESCE(:OLD.C_PROJECT_ID, '0') <> COALESCE(:NEW.C_PROJECT_ID, '0'))
       OR(COALESCE(:OLD.C_GLITEM_ID, '0') <> COALESCE(:NEW.C_GLITEM_ID, '0'))        
       OR(COALESCE(:OLD.C_CAMPAIGN_ID, '0') <> COALESCE(:NEW.C_CAMPAIGN_ID, '0'))
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -6,7 +6,7 @@
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.21974]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.22139]]></VERSION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <DESCRIPTION><![CDATA[Managing your finances with an ERP does not have to be difficult. Enjoy a radically improved user experience that combines the power of an enterprise grade financial application with the simplicity and ease of a web 2.0 personal accounting service.]]></DESCRIPTION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <HELP><![CDATA[Advanced Payables and Receivables Management simplifies and automates the business processes around the management of financial accounts, from the receipt and issue of payment, to the reconciliation of those events with bank statements.
 If you would like to help shape this module you are welcome to take part in the forum discussions or register feature requests or issues in the corresponding (Forum and Bug Tracking) sections in the Advanced Payables and Receivable project in the OB Forge.]]></HELP>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -7,7 +7,7 @@
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
-<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.21974]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.22139]]></STARTVERSION>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--B97FC854C6DD41E692161585645A900F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--B97FC854C6DD41E692161585645A900F-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--B97FC854C6DD41E692161585645A900F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.21974]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.22139]]></STARTVERSION>
 <!--B97FC854C6DD41E692161585645A900F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -18,6 +18,7 @@
 <!--017312F51139438A9665775E3B5392A1-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
 <!--017312F51139438A9665775E3B5392A1-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--017312F51139438A9665775E3B5392A1-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--017312F51139438A9665775E3B5392A1-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--017312F51139438A9665775E3B5392A1--></AD_PROCESS>
 
 <!--0BDC2164ED3E48539FCEF4D306F29EFD--><AD_PROCESS>
@@ -38,6 +39,7 @@
 <!--0BDC2164ED3E48539FCEF4D306F29EFD-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
 <!--0BDC2164ED3E48539FCEF4D306F29EFD-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--0BDC2164ED3E48539FCEF4D306F29EFD-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--0BDC2164ED3E48539FCEF4D306F29EFD-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--0BDC2164ED3E48539FCEF4D306F29EFD--></AD_PROCESS>
 
 <!--12016E2EDE0245B5A36B84CBA144DBDF--><AD_PROCESS>
@@ -59,6 +61,7 @@
 <!--12016E2EDE0245B5A36B84CBA144DBDF-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--12016E2EDE0245B5A36B84CBA144DBDF-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--12016E2EDE0245B5A36B84CBA144DBDF-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--12016E2EDE0245B5A36B84CBA144DBDF-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--12016E2EDE0245B5A36B84CBA144DBDF--></AD_PROCESS>
 
 <!--15C8708DFC464C2D91286E59624FDD18--><AD_PROCESS>
@@ -81,6 +84,7 @@
 <!--15C8708DFC464C2D91286E59624FDD18-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
 <!--15C8708DFC464C2D91286E59624FDD18-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--15C8708DFC464C2D91286E59624FDD18-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--15C8708DFC464C2D91286E59624FDD18-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--15C8708DFC464C2D91286E59624FDD18--></AD_PROCESS>
 
 <!--29D17F515727436DBCE32BC6CA28382B--><AD_PROCESS>
@@ -101,6 +105,7 @@
 <!--29D17F515727436DBCE32BC6CA28382B-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
 <!--29D17F515727436DBCE32BC6CA28382B-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--29D17F515727436DBCE32BC6CA28382B-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--29D17F515727436DBCE32BC6CA28382B-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--29D17F515727436DBCE32BC6CA28382B--></AD_PROCESS>
 
 <!--2EED9BC16DB34D2B80BA40A21564BECF--><AD_PROCESS>
@@ -123,6 +128,7 @@
 <!--2EED9BC16DB34D2B80BA40A21564BECF-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--2EED9BC16DB34D2B80BA40A21564BECF-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--2EED9BC16DB34D2B80BA40A21564BECF-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--2EED9BC16DB34D2B80BA40A21564BECF-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--2EED9BC16DB34D2B80BA40A21564BECF--></AD_PROCESS>
 
 <!--3C4A5FB206B74C3CA9FE20116FCA0464--><AD_PROCESS>
@@ -143,6 +149,7 @@
 <!--3C4A5FB206B74C3CA9FE20116FCA0464-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--3C4A5FB206B74C3CA9FE20116FCA0464-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--3C4A5FB206B74C3CA9FE20116FCA0464-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--3C4A5FB206B74C3CA9FE20116FCA0464-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--3C4A5FB206B74C3CA9FE20116FCA0464--></AD_PROCESS>
 
 <!--4A059E4F79294640AD37B1B718C56E5D--><AD_PROCESS>
@@ -165,6 +172,7 @@
 <!--4A059E4F79294640AD37B1B718C56E5D-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--4A059E4F79294640AD37B1B718C56E5D-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--4A059E4F79294640AD37B1B718C56E5D-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--4A059E4F79294640AD37B1B718C56E5D-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--4A059E4F79294640AD37B1B718C56E5D--></AD_PROCESS>
 
 <!--58A9261BACEF45DDA526F29D8557272D--><AD_PROCESS>
@@ -185,6 +193,7 @@
 <!--58A9261BACEF45DDA526F29D8557272D-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
 <!--58A9261BACEF45DDA526F29D8557272D-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--58A9261BACEF45DDA526F29D8557272D-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--58A9261BACEF45DDA526F29D8557272D-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--58A9261BACEF45DDA526F29D8557272D--></AD_PROCESS>
 
 <!--5BE14AA10165490A9ADEFB7532F7FA94--><AD_PROCESS>
@@ -205,6 +214,7 @@
 <!--5BE14AA10165490A9ADEFB7532F7FA94-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
 <!--5BE14AA10165490A9ADEFB7532F7FA94-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--5BE14AA10165490A9ADEFB7532F7FA94-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--5BE14AA10165490A9ADEFB7532F7FA94-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--5BE14AA10165490A9ADEFB7532F7FA94--></AD_PROCESS>
 
 <!--6255BE488882480599C81284B70CD9B3--><AD_PROCESS>
@@ -225,6 +235,7 @@
 <!--6255BE488882480599C81284B70CD9B3-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
 <!--6255BE488882480599C81284B70CD9B3-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--6255BE488882480599C81284B70CD9B3-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--6255BE488882480599C81284B70CD9B3-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--6255BE488882480599C81284B70CD9B3--></AD_PROCESS>
 
 <!--62E6270312534380B9A8BDF603CA8FBB--><AD_PROCESS>
@@ -246,6 +257,7 @@
 <!--62E6270312534380B9A8BDF603CA8FBB-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--62E6270312534380B9A8BDF603CA8FBB-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--62E6270312534380B9A8BDF603CA8FBB-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--62E6270312534380B9A8BDF603CA8FBB-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--62E6270312534380B9A8BDF603CA8FBB--></AD_PROCESS>
 
 <!--7AC7BE9024E448A0BB863C159DA762F9--><AD_PROCESS>
@@ -267,6 +279,7 @@
 <!--7AC7BE9024E448A0BB863C159DA762F9-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--7AC7BE9024E448A0BB863C159DA762F9-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--7AC7BE9024E448A0BB863C159DA762F9-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--7AC7BE9024E448A0BB863C159DA762F9-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--7AC7BE9024E448A0BB863C159DA762F9--></AD_PROCESS>
 
 <!--B54318B49E984B9CB855AEFB1F474CD6--><AD_PROCESS>
@@ -288,6 +301,7 @@
 <!--B54318B49E984B9CB855AEFB1F474CD6-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--B54318B49E984B9CB855AEFB1F474CD6-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--B54318B49E984B9CB855AEFB1F474CD6-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--B54318B49E984B9CB855AEFB1F474CD6-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--B54318B49E984B9CB855AEFB1F474CD6--></AD_PROCESS>
 
 <!--BBA11D1A061346459AF6148920FE6629--><AD_PROCESS>
@@ -308,6 +322,7 @@
 <!--BBA11D1A061346459AF6148920FE6629-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--BBA11D1A061346459AF6148920FE6629-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--BBA11D1A061346459AF6148920FE6629-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--BBA11D1A061346459AF6148920FE6629-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--BBA11D1A061346459AF6148920FE6629--></AD_PROCESS>
 
 <!--C125EA7C85234D8B89FEA511FCCD2E9E--><AD_PROCESS>
@@ -328,6 +343,7 @@
 <!--C125EA7C85234D8B89FEA511FCCD2E9E-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--C125EA7C85234D8B89FEA511FCCD2E9E-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--C125EA7C85234D8B89FEA511FCCD2E9E-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--C125EA7C85234D8B89FEA511FCCD2E9E-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--C125EA7C85234D8B89FEA511FCCD2E9E--></AD_PROCESS>
 
 <!--D16966FBF9604A3D91A50DC83C6EA8E3--><AD_PROCESS>
@@ -349,6 +365,7 @@
 <!--D16966FBF9604A3D91A50DC83C6EA8E3-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
 <!--D16966FBF9604A3D91A50DC83C6EA8E3-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--D16966FBF9604A3D91A50DC83C6EA8E3-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--D16966FBF9604A3D91A50DC83C6EA8E3-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--D16966FBF9604A3D91A50DC83C6EA8E3--></AD_PROCESS>
 
 <!--D5B90B539C254B959045EDCA1DC99BDF--><AD_PROCESS>
@@ -371,6 +388,7 @@
 <!--D5B90B539C254B959045EDCA1DC99BDF-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--D5B90B539C254B959045EDCA1DC99BDF-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--D5B90B539C254B959045EDCA1DC99BDF-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--D5B90B539C254B959045EDCA1DC99BDF-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--D5B90B539C254B959045EDCA1DC99BDF--></AD_PROCESS>
 
 <!--DC23BB9234174E52879E4B21C8CD1F4B--><AD_PROCESS>
@@ -392,6 +410,7 @@
 <!--DC23BB9234174E52879E4B21C8CD1F4B-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--DC23BB9234174E52879E4B21C8CD1F4B-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--DC23BB9234174E52879E4B21C8CD1F4B-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--DC23BB9234174E52879E4B21C8CD1F4B-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--DC23BB9234174E52879E4B21C8CD1F4B--></AD_PROCESS>
 
 <!--DE1B382FDD2540199D223586F6E216D0--><AD_PROCESS>
@@ -414,6 +433,7 @@
 <!--DE1B382FDD2540199D223586F6E216D0-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
 <!--DE1B382FDD2540199D223586F6E216D0-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--DE1B382FDD2540199D223586F6E216D0-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--DE1B382FDD2540199D223586F6E216D0-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--DE1B382FDD2540199D223586F6E216D0--></AD_PROCESS>
 
 <!--E011F492B0814A74B63CD1F3B9FF0526--><AD_PROCESS>
@@ -434,6 +454,7 @@
 <!--E011F492B0814A74B63CD1F3B9FF0526-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--E011F492B0814A74B63CD1F3B9FF0526-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--E011F492B0814A74B63CD1F3B9FF0526-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--E011F492B0814A74B63CD1F3B9FF0526-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--E011F492B0814A74B63CD1F3B9FF0526--></AD_PROCESS>
 
 <!--E3E92E9F08214507958E6875E66F2F99--><AD_PROCESS>
@@ -455,6 +476,7 @@
 <!--E3E92E9F08214507958E6875E66F2F99-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--E3E92E9F08214507958E6875E66F2F99-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--E3E92E9F08214507958E6875E66F2F99-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--E3E92E9F08214507958E6875E66F2F99-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--E3E92E9F08214507958E6875E66F2F99--></AD_PROCESS>
 
 <!--E54287EE357C493EB127DC3BA1758751--><AD_PROCESS>
@@ -476,6 +498,7 @@
 <!--E54287EE357C493EB127DC3BA1758751-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--E54287EE357C493EB127DC3BA1758751-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--E54287EE357C493EB127DC3BA1758751-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--E54287EE357C493EB127DC3BA1758751-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--E54287EE357C493EB127DC3BA1758751--></AD_PROCESS>
 
 <!--EB3D56BDD37E4229B67DBAB9F9A9B167--><AD_PROCESS>
@@ -497,6 +520,7 @@
 <!--EB3D56BDD37E4229B67DBAB9F9A9B167-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--EB3D56BDD37E4229B67DBAB9F9A9B167-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--EB3D56BDD37E4229B67DBAB9F9A9B167-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--EB3D56BDD37E4229B67DBAB9F9A9B167-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--EB3D56BDD37E4229B67DBAB9F9A9B167--></AD_PROCESS>
 
 <!--F68F2890E96D4D85A1DEF0274D105BCE--><AD_PROCESS>
@@ -517,6 +541,7 @@
 <!--F68F2890E96D4D85A1DEF0274D105BCE-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
 <!--F68F2890E96D4D85A1DEF0274D105BCE-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--F68F2890E96D4D85A1DEF0274D105BCE-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--F68F2890E96D4D85A1DEF0274D105BCE-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--F68F2890E96D4D85A1DEF0274D105BCE--></AD_PROCESS>
 
 <!--FF8080812E2F8EAE012E2F94CF470014--><AD_PROCESS>
@@ -538,6 +563,7 @@
 <!--FF8080812E2F8EAE012E2F94CF470014-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
 <!--FF8080812E2F8EAE012E2F94CF470014-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--FF8080812E2F8EAE012E2F94CF470014-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--FF8080812E2F8EAE012E2F94CF470014-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--FF8080812E2F8EAE012E2F94CF470014--></AD_PROCESS>
 
 <!--FF8080812F348A97012F349DC24F0007--><AD_PROCESS>
@@ -558,6 +584,7 @@
 <!--FF8080812F348A97012F349DC24F0007-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
 <!--FF8080812F348A97012F349DC24F0007-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--FF8080812F348A97012F349DC24F0007-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--FF8080812F348A97012F349DC24F0007-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--FF8080812F348A97012F349DC24F0007--></AD_PROCESS>
 
 </data>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -222,7 +222,7 @@
 <!--8ED43FD56EE041F2BBC1C0AE0A56D632-->  <AD_REFERENCE_ID><![CDATA[15]]></AD_REFERENCE_ID>
 <!--8ED43FD56EE041F2BBC1C0AE0A56D632-->  <COLUMNNAME><![CDATA[paymentDate]]></COLUMNNAME>
 <!--8ED43FD56EE041F2BBC1C0AE0A56D632-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--8ED43FD56EE041F2BBC1C0AE0A56D632-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--8ED43FD56EE041F2BBC1C0AE0A56D632-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
 <!--8ED43FD56EE041F2BBC1C0AE0A56D632-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--8ED43FD56EE041F2BBC1C0AE0A56D632-->  <ISRANGE><![CDATA[N]]></ISRANGE>
 <!--8ED43FD56EE041F2BBC1C0AE0A56D632-->  <AD_ELEMENT_ID><![CDATA[256AB5C3D6144B2C9884CF0FA4D81911]]></AD_ELEMENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -12,6 +12,18 @@
 <!--0CC268ED2E8D4B0397A0DCBBFA2237DE-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
 <!--0CC268ED2E8D4B0397A0DCBBFA2237DE--></AD_REFERENCE>
 
+<!--1221BEA5C19F4FA89D3565CA8877A82E--><AD_REFERENCE>
+<!--1221BEA5C19F4FA89D3565CA8877A82E-->  <AD_REFERENCE_ID><![CDATA[1221BEA5C19F4FA89D3565CA8877A82E]]></AD_REFERENCE_ID>
+<!--1221BEA5C19F4FA89D3565CA8877A82E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1221BEA5C19F4FA89D3565CA8877A82E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1221BEA5C19F4FA89D3565CA8877A82E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1221BEA5C19F4FA89D3565CA8877A82E-->  <NAME><![CDATA[Organization Selector]]></NAME>
+<!--1221BEA5C19F4FA89D3565CA8877A82E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--1221BEA5C19F4FA89D3565CA8877A82E-->  <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE>
+<!--1221BEA5C19F4FA89D3565CA8877A82E-->  <PARENTREFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></PARENTREFERENCE_ID>
+<!--1221BEA5C19F4FA89D3565CA8877A82E-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
+<!--1221BEA5C19F4FA89D3565CA8877A82E--></AD_REFERENCE>
+
 <!--15CCD38B5F534E03BB3C344BCD1FBB1E--><AD_REFERENCE>
 <!--15CCD38B5F534E03BB3C344BCD1FBB1E-->  <AD_REFERENCE_ID><![CDATA[15CCD38B5F534E03BB3C344BCD1FBB1E]]></AD_REFERENCE_ID>
 <!--15CCD38B5F534E03BB3C344BCD1FBB1E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PROCESS.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PROCESS.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -13,6 +13,7 @@
 <!--4EEB3497082C4F2182E16A4371CD5D96-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--4EEB3497082C4F2182E16A4371CD5D96-->  <UIPATTERN><![CDATA[OBUIAPP_PickAndExecute]]></UIPATTERN>
 <!--4EEB3497082C4F2182E16A4371CD5D96-->  <ISMULTIRECORD><![CDATA[N]]></ISMULTIRECORD>
+<!--4EEB3497082C4F2182E16A4371CD5D96-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--4EEB3497082C4F2182E16A4371CD5D96--></OBUIAPP_PROCESS>
 
 <!--6F87442DF7BC43AB8A666BDED2F7D64E--><OBUIAPP_PROCESS>
@@ -28,6 +29,7 @@
 <!--6F87442DF7BC43AB8A666BDED2F7D64E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--6F87442DF7BC43AB8A666BDED2F7D64E-->  <UIPATTERN><![CDATA[OBUIAPP_PickAndExecute]]></UIPATTERN>
 <!--6F87442DF7BC43AB8A666BDED2F7D64E-->  <ISMULTIRECORD><![CDATA[N]]></ISMULTIRECORD>
+<!--6F87442DF7BC43AB8A666BDED2F7D64E-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--6F87442DF7BC43AB8A666BDED2F7D64E--></OBUIAPP_PROCESS>
 
 <!--8D0D32CC819E449D9A08E0459B482963--><OBUIAPP_PROCESS>
@@ -43,6 +45,7 @@
 <!--8D0D32CC819E449D9A08E0459B482963-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--8D0D32CC819E449D9A08E0459B482963-->  <UIPATTERN><![CDATA[OBUIAPP_PickAndExecute]]></UIPATTERN>
 <!--8D0D32CC819E449D9A08E0459B482963-->  <ISMULTIRECORD><![CDATA[N]]></ISMULTIRECORD>
+<!--8D0D32CC819E449D9A08E0459B482963-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--8D0D32CC819E449D9A08E0459B482963--></OBUIAPP_PROCESS>
 
 </data>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -69,6 +69,22 @@
 <!--A98899B1C75A4F4EBD3414F1B654EFAB-->  <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY>
 <!--A98899B1C75A4F4EBD3414F1B654EFAB--></OBUISEL_SELECTOR>
 
+<!--B15DC1DA631A402C9B05AC11A2EA724C--><OBUISEL_SELECTOR>
+<!--B15DC1DA631A402C9B05AC11A2EA724C-->  <OBUISEL_SELECTOR_ID><![CDATA[B15DC1DA631A402C9B05AC11A2EA724C]]></OBUISEL_SELECTOR_ID>
+<!--B15DC1DA631A402C9B05AC11A2EA724C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B15DC1DA631A402C9B05AC11A2EA724C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B15DC1DA631A402C9B05AC11A2EA724C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--B15DC1DA631A402C9B05AC11A2EA724C-->  <NAME><![CDATA[Organization]]></NAME>
+<!--B15DC1DA631A402C9B05AC11A2EA724C-->  <AD_REFERENCE_ID><![CDATA[1221BEA5C19F4FA89D3565CA8877A82E]]></AD_REFERENCE_ID>
+<!--B15DC1DA631A402C9B05AC11A2EA724C-->  <AD_TABLE_ID><![CDATA[155]]></AD_TABLE_ID>
+<!--B15DC1DA631A402C9B05AC11A2EA724C-->  <WHERECLAUSE><![CDATA[AD_ISORGINCLUDED(e.id, @inpadOrgId@,e.client.id)<>-1]]></WHERECLAUSE>
+<!--B15DC1DA631A402C9B05AC11A2EA724C-->  <OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID>
+<!--B15DC1DA631A402C9B05AC11A2EA724C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B15DC1DA631A402C9B05AC11A2EA724C-->  <SUGGESTIONTEXTMATCHSTYLE><![CDATA[startsWith]]></SUGGESTIONTEXTMATCHSTYLE>
+<!--B15DC1DA631A402C9B05AC11A2EA724C-->  <POPUPTEXTMATCHSTYLE><![CDATA[startsWith]]></POPUPTEXTMATCHSTYLE>
+<!--B15DC1DA631A402C9B05AC11A2EA724C-->  <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY>
+<!--B15DC1DA631A402C9B05AC11A2EA724C--></OBUISEL_SELECTOR>
+
 <!--FF808181312D569C01312D8C1EC40036--><OBUISEL_SELECTOR>
 <!--FF808181312D569C01312D8C1EC40036-->  <OBUISEL_SELECTOR_ID><![CDATA[FF808181312D569C01312D8C1EC40036]]></OBUISEL_SELECTOR_ID>
 <!--FF808181312D569C01312D8C1EC40036-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -46,6 +46,28 @@
 <!--17843AC2A9E247E1A6DAD8041DFDB07A-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--17843AC2A9E247E1A6DAD8041DFDB07A--></OBUISEL_SELECTOR_FIELD>
 
+<!--198C982111AA4CF5ABF5E651ECD611FA--><OBUISEL_SELECTOR_FIELD>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[198C982111AA4CF5ABF5E651ECD611FA]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <OBUISEL_SELECTOR_ID><![CDATA[B15DC1DA631A402C9B05AC11A2EA724C]]></OBUISEL_SELECTOR_ID>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <AD_COLUMN_ID><![CDATA[522]]></AD_COLUMN_ID>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <NAME><![CDATA[Name]]></NAME>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <DESCRIPTION><![CDATA[A non-unique identifier for a record/document often used as a search tool.]]></DESCRIPTION>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <HELP><![CDATA[A more descriptive identifier (that does need to be unique) of a record/document that is used as a default search option along with the search key (that is unique and mostly shorter). It is up to 60 characters in length.]]></HELP>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <PROPERTY><![CDATA[name]]></PROPERTY>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <SORT><![CDATA[Y]]></SORT>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <SEARCHINSUGGESTIONBOX><![CDATA[Y]]></SEARCHINSUGGESTIONBOX>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <SORTNO><![CDATA[1]]></SORTNO>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--198C982111AA4CF5ABF5E651ECD611FA--></OBUISEL_SELECTOR_FIELD>
+
 <!--334D0D40EF224D5CA5B9AA56124FEE25--><OBUISEL_SELECTOR_FIELD>
 <!--334D0D40EF224D5CA5B9AA56124FEE25-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[334D0D40EF224D5CA5B9AA56124FEE25]]></OBUISEL_SELECTOR_FIELD_ID>
 <!--334D0D40EF224D5CA5B9AA56124FEE25-->  <OBUISEL_SELECTOR_ID><![CDATA[A98899B1C75A4F4EBD3414F1B654EFAB]]></OBUISEL_SELECTOR_ID>
@@ -287,6 +309,30 @@
 <!--C5CFD3978631444EB97539BCEE3D5239-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--C5CFD3978631444EB97539BCEE3D5239--></OBUISEL_SELECTOR_FIELD>
 
+<!--F229E4FBC3DB4BA6AA295C19E0798785--><OBUISEL_SELECTOR_FIELD>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[F229E4FBC3DB4BA6AA295C19E0798785]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <OBUISEL_SELECTOR_ID><![CDATA[B15DC1DA631A402C9B05AC11A2EA724C]]></OBUISEL_SELECTOR_ID>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <AD_COLUMN_ID><![CDATA[2045]]></AD_COLUMN_ID>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <NAME><![CDATA[Search Key]]></NAME>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <DESCRIPTION><![CDATA[A fast method for finding a particular record.]]></DESCRIPTION>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <HELP><![CDATA[A search key allows for a fast method of finding a particular record. If you leave the search key empty, the system automatically creates a numeric number originating from a document sequence defined in the  "Document Sequence" window. The sequence naming convention follows a rule "DocumentNo_TableName", where TableName is the actual name of the database table (e.g. C_Order).
+
+Usually, company's internal identifiers for various records (products, customers, etc) are stored here.]]></HELP>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <PROPERTY><![CDATA[searchKey]]></PROPERTY>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <SORT><![CDATA[Y]]></SORT>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <SORTNO><![CDATA[2]]></SORTNO>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--F229E4FBC3DB4BA6AA295C19E0798785--></OBUISEL_SELECTOR_FIELD>
+
 <!--FF808181312DEEAE01312DFAFE910022--><OBUISEL_SELECTOR_FIELD>
 <!--FF808181312DEEAE01312DFAFE910022-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[FF808181312DEEAE01312DFAFE910022]]></OBUISEL_SELECTOR_FIELD_ID>
 <!--FF808181312DEEAE01312DFAFE910022-->  <OBUISEL_SELECTOR_ID><![CDATA[FF808181312DA8D801312DDE869B000C]]></OBUISEL_SELECTOR_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/TestUtility.java	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/TestUtility.java	Wed Feb 26 15:15:03 2014 +0100
@@ -457,10 +457,10 @@
    * Method used to generating payment document with refund amount.
    * 
    * @param payment
-   *          . Created Payment.
+   *          Created Payment.
    * @param refundAmount
-   *          . Refund Amount need to transfer to the customer.
-   * @return. Created FIN_Payment object.
+   *          Refund Amount need to transfer to the customer.
+   * @return Created FIN_Payment object.
    * @throws Exception
    *           In case of executing invalid data.
    */
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html	Wed Feb 26 15:15:03 2014 +0100
@@ -92,7 +92,6 @@
           document.frmMain.isFirstLoad.value='false';
           actualPaymentOnChange();
         }
-        debugger;
         displayLogicElement('doubtfulDebt', (document.frmMain.displayDoubtfulDebt.value === 'true'));
       } else {
         document.getElementById('sectionGrid').innerHTML = '';
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentGrid.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentGrid.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -12,7 +12,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2012 Openbravo SLU
+ * All portions are Copyright (C) 2010-2014 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -28,14 +28,14 @@
     <FIELD id="fieldRecordId" attribute="name" replace="xx">rownum</FIELD>
     <FIELD id="fieldRecordAmt" attribute="value" format="euroEdition">outstandingAmount</FIELD>
     <FIELD id="fieldRecordAmt" attribute="name" replace="xx">finScheduledPaymentDetailId</FIELD>
-    <FIELD id="fieldOrderNr">orderNrTrunc</FIELD>
-    <FIELD id="fieldOrderNr" attribute="title" replace="zz">orderNr</FIELD>
-    <FIELD id="fieldInvoiceNr">invoiceNrTrunc</FIELD>
-    <FIELD id="fieldInvoiceNr" attribute="title" replace="zz">invoiceNr</FIELD>
-    <FIELD id="businessPartnerName" attribute="title">businessPartnerName</FIELD>
-    <FIELD id="businessPartnerName">businessPartnerNameTrunc</FIELD>
-    <FIELD id="fieldPaymentMethod">paymentMethodNameTrunc</FIELD>
-    <FIELD id="fieldPaymentMethod" attribute="title" replace="zz">paymentMethodName</FIELD>
+    <FIELD id="fieldOrderNr" replaceCharacters="html">orderNrTrunc</FIELD>
+    <FIELD id="fieldOrderNr" attribute="title" replace="zz" replaceCharacters="html">orderNr</FIELD>
+    <FIELD id="fieldInvoiceNr" replaceCharacters="html">invoiceNrTrunc</FIELD>
+    <FIELD id="fieldInvoiceNr" attribute="title" replace="zz" replaceCharacters="html">invoiceNr</FIELD>
+    <FIELD id="businessPartnerName" attribute="title" replaceCharacters="html">businessPartnerName</FIELD>
+    <FIELD id="businessPartnerName" replaceCharacters="html">businessPartnerNameTrunc</FIELD>
+    <FIELD id="fieldPaymentMethod" replaceCharacters="html">paymentMethodNameTrunc</FIELD>
+    <FIELD id="fieldPaymentMethod" attribute="title" replace="zz" replaceCharacters="html">paymentMethodName</FIELD>
     <FIELD id="fieldExpectedDate">expectedDate</FIELD>
     <FIELD id="fieldInvoicedAmount" format="euroEdition">invoicedAmount</FIELD>
     <FIELD id="fieldExpectedAmount" format="euroEdition">expectedAmount</FIELD>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html	Wed Feb 26 15:15:03 2014 +0100
@@ -12,7 +12,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2013 Openbravo SLU
+ * All portions are Copyright (C) 2013-2014 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -90,7 +90,11 @@
       }
     }
   } else if (opt == 'GL') {
-    if (frm.inpGLItemId.value==null || frm.inpGLItemId.value=="") {
+	if (frm.inpadOrgTrxId.value===null || frm.inpadOrgTrxId.value==="") {
+	  setWindowElementFocus(frm.inpadOrgTrxId);
+	  showJSMessage(7);
+	  return false;
+	} else if (frm.inpGLItemId.value==null || frm.inpGLItemId.value=="") {
       setWindowElementFocus(frm.inpGLItemId);
       showJSMessage(7);
       return false;
@@ -182,6 +186,12 @@
 
 function autoDisplayLogicDimensions(isDisplayed) {
   var displayTitle = false;
+  if (document.frmMain.strElement_OT.value === 'Y' && isDisplayed) {
+	    displayLogicDimension('ad_orgtrx_id', true);
+	    displayTitle = true;
+	  } else {
+	    displayLogicDimension('ad_orgtrx_id', false);
+	  }
   if (document.frmMain.strElement_BP.value === 'Y' && isDisplayed) {
     displayLogicDimension('c_bpartner_id', true);
     displayTitle = true;
@@ -392,6 +402,7 @@
 
   function onResizeDo(){
     resizeAreaCreateFrom(true);
+    showHideLayers();
   }
 </script>
 </head>
@@ -406,6 +417,7 @@
   <input type="hidden" name="inpFinBankStatementLineId" value="" id="fieldFinBankStatementLineId"></input>
   <input type="hidden" name="buttonRefresh" value="" id="buttonRefresh" onclick="loadGrid();return true;"></input>
   <input type="hidden" name="isReceipt" value="dummyField" id="fieldReceipt"/>
+  <input type="hidden" name="strElement_OT" id="paramStrElement_OT" value=""/>
   <input type="hidden" name="strElement_BP" id="paramStrElement_BP" value=""/>
   <input type="hidden" name="strElement_PR" id="paramStrElement_PR" value=""/>
   <input type="hidden" name="strElement_PJ" id="paramStrElement_PJ" value=""/>
@@ -922,9 +934,22 @@
               </td>
             </tr>
             <tr id="GLItemSection1_Dim">
+              <!-- Organization Dimension -->
+              <td id="ad_orgtrx_id_dim_label" class="TitleCell"><span class="LabelText">Organization</span></td>
+              <td id="ad_orgtrx_id_dim_inp" class="TextBox_ContentCell" colspan="2">
+                <table style="border:0px;border-collapse:collapse;">
+                  <tr>
+                    <td style="padding-top: 0px;">
+                      <script>var sc_AD_OrgTrx_ID = null;</script>
+                      <input type="hidden" name="inpadOrgTrxId" identifier="" id="AD_Org_ID" value="" onreset="sc_AD_OrgTrx_ID.resetSelector();" onchange="openbravo.Utilities.updateSmartClientComponentValue(this, sc_AD_OrgTrx_ID.selectorField);"></input>
+                      <script id="selectorLink" src="../org.openbravo.client.kernel/OBUISEL_Selector/B15DC1DA631A402C9B05AC11A2EA724C?columnName=AD_Org_ID&disabled=false&CssSize=TwoCells&DisplayLength=45.0&required=true"></script>
+                    </td>
+                  </tr>
+                </table>
+              </td>
               <!-- Business Partner Dimension -->
               <td id="c_bpartner_id_dim_label" class="TitleCell"><span class="LabelText">Business Partner</span></td>
-              <td id="c_bpartner_id_dim_inp" class="TextBox_ContentCell" colspan="2">
+              <td id="c_bpartner_id_dim_inp" class="TextBox_ContentCell" colspan="1">
                 <table style="border:0px;border-collapse:collapse;">
                   <tr>
                     <td style="padding-top: 0px;">
@@ -935,9 +960,12 @@
                   </tr>
                 </table>
               </td>
+            <td class="TitleCell"></td>
+            </tr>
+            <tr id="GLItemSection2_Dim">
                 <!-- Product Dimension -->
               <td id="m_product_id_dim_label" class="TitleCell"><span class="LabelText">Product</span></td>
-              <td id="m_product_id_dim_inp" class="TextBox_ContentCell" colspan="1">
+              <td id="m_product_id_dim_inp" class="TextBox_ContentCell" colspan="2">
                 <table style="border:0px;border-collapse:collapse;">
                   <tr>
                     <td style="padding-top: 0px;">
@@ -947,13 +975,10 @@
                     </td>
                   </tr>
                 </table>
-              </td> 
-            <td class="TitleCell"></td>
-            </tr>
-            <tr id="GLItemSection2_Dim">
+              </td>
                <!-- Project Dimension -->
               <td id="c_project_id_dim_label" class="TitleCell"><span class="LabelText">Project</span></td>
-              <td id="c_project_id_dim_inp" class="TextBox_ContentCell" colspan="2">
+              <td id="c_project_id_dim_inp" class="TextBox_ContentCell" colspan="1">
                 <table style="border:0px;border-collapse:collapse;">
                   <tr>
                     <td style="padding-top: 0px;">
@@ -964,9 +989,12 @@
                   </tr>
                 </table>
               </td>
-              <!-- Cost center -->
+            <td class="TitleCell"></td>
+            </tr>
+            <tr id="GLItemSection3_Dim">
+                <!-- Cost center -->
               <td id="c_costcenter_id_dim_label" class="TitleCell"><span class="LabelText">Cost Center</span></td>
-              <td id="c_costcenter_id_dim_inp" class="TextBox_ContentCell" colspan="1">
+              <td id="c_costcenter_id_dim_inp" class="TextBox_ContentCell" colspan="2">
                 <table style="border:0px;border-collapse:collapse;">
                   <tr>
                     <td style="padding-top: 0px;">
@@ -977,12 +1005,9 @@
                   </tr>
                 </table>
               </td>
-            <td class="TitleCell"></td>
-            </tr>
-            <tr id="GLItemSection3_Dim">
              <!-- Campaign Dimension -->
               <td id="c_campaign_id_dim_label" class="TitleCell"><span class="LabelText">Campaign</span></td>
-              <td id="c_campaign_id_dim_inp" class="TextBox_ContentCell" colspan="2">
+              <td id="c_campaign_id_dim_inp" class="TextBox_ContentCell" colspan="1">
                 <table style="border:0px;border-collapse:collapse;">
                   <tr>
                     <td style="padding-top: 0px;">
@@ -993,19 +1018,6 @@
                   </tr>
                 </table>
               </td>
-               <!-- Activity Dimension -->
-              <td id="c_activity_id_dim_label" class="TitleCell"><span class="LabelText">Activity</span></td>
-              <td id="c_activity_id_dim_inp" class="TextBox_ContentCell" colspan="1">
-                <table style="border:0px;border-collapse:collapse;">
-                  <tr>
-                    <td style="padding-top: 0px;">
-                      <script>var sc_C_Activity_ID = null;</script>
-                      <input type="hidden" name="inpCActivityId" id="C_Activity_ID" value="" onreset="sc_C_Activity_ID.resetSelector();" onchange="openbravo.Utilities.updateSmartClientComponentValue(this, sc_C_Activity_ID.selectorField);"></input>
-                      <script id="selectorLink" src="../org.openbravo.client.kernel/OBUISEL_Selector/FF808181312D569C01312D8C1EC40036?columnName=C_Activity_ID&disabled=false&CssSize=TwoCells&DisplayLength=45.0&required=false"></script>
-                    </td>
-                  </tr>
-                </table>
-              </td>             
              <td class="TitleCell"></td>
              </tr>
               <tr id="GLItemSection4_Dim">
@@ -1038,9 +1050,22 @@
               <td class="TitleCell"></td> 
               </tr>
               <tr id="GLItemSection5_Dim">
+              <!-- Activity Dimension -->
+              <td id="c_activity_id_dim_label" class="TitleCell"><span class="LabelText">Activity</span></td>
+              <td id="c_activity_id_dim_inp" class="TextBox_ContentCell" colspan="2">
+                <table style="border:0px;border-collapse:collapse;">
+                  <tr>
+                    <td style="padding-top: 0px;">
+                      <script>var sc_C_Activity_ID = null;</script>
+                      <input type="hidden" name="inpCActivityId" id="C_Activity_ID" value="" onreset="sc_C_Activity_ID.resetSelector();" onchange="openbravo.Utilities.updateSmartClientComponentValue(this, sc_C_Activity_ID.selectorField);"></input>
+                      <script id="selectorLink" src="../org.openbravo.client.kernel/OBUISEL_Selector/FF808181312D569C01312D8C1EC40036?columnName=C_Activity_ID&disabled=false&CssSize=TwoCells&DisplayLength=45.0&required=false"></script>
+                    </td>
+                  </tr>
+                </table>
+              </td>
               <!-- Sales Region Dimension -->
               <td id="c_salesregion_id_dim_label" class="TitleCell"><span class="LabelText">Sales Region</span></td>
-              <td id="c_salesregion_id_dim_inp" class="TextBox_ContentCell" colspan="2">
+              <td id="c_salesregion_id_dim_inp" class="TextBox_ContentCell" colspan="1">
                 <table style="border:0px;border-collapse:collapse;">
                   <tr>
                     <td style="padding-top: 0px;">
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java	Wed Feb 26 15:15:03 2014 +0100
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2013 Openbravo SLU
+ * All portions are Copyright (C) 2010-2014 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -237,6 +237,10 @@
 
       } else if (strTransactionType.equals("GL")) { // GL Item
         // Accounting Dimensions
+        final String strElement_OT = vars.getStringParameter("inpadOrgTrxId", IsIDFilter.instance);
+        final Organization organization = OBDal.getInstance()
+            .get(Organization.class, strElement_OT);
+
         final String strElement_BP = vars.getStringParameter("inpCBPartnerId", IsIDFilter.instance);
         final BusinessPartner businessPartner = OBDal.getInstance().get(BusinessPartner.class,
             strElement_BP);
@@ -278,9 +282,9 @@
         boolean isReceipt = (glItemDepositAmt.compareTo(glItemPaymentAmt) >= 0);
 
         // Currency, Organization, paymentDate,
-        FIN_FinaccTransaction finTrans = dao.getNewFinancialTransaction(account.getOrganization(),
-            account, TransactionsDao.getTransactionMaxLineNo(account) + 10, null, description,
-            FIN_Utility.getDate(strTransactionDate), glItem, isReceipt ? "RDNC" : "PWNC",
+        FIN_FinaccTransaction finTrans = dao.getNewFinancialTransaction(organization, account,
+            TransactionsDao.getTransactionMaxLineNo(account) + 10, null, description, FIN_Utility
+                .getDate(strTransactionDate), glItem, isReceipt ? "RDNC" : "PWNC",
             glItemDepositAmt, glItemPaymentAmt, project, campaign, activity, isReceipt ? "BPD"
                 : "BPW", FIN_Utility.getDate(strTransactionDate), null, null, null,
             businessPartner, product, salesRegion, user1, user2, costcenter);
@@ -365,6 +369,9 @@
     xmlDocument.setParameter("windowId", strWindowId);
     xmlDocument.setParameter("tabId", strTabId);
     xmlDocument.setParameter("orgId", strOrgId);
+    xmlDocument.setParameter("orgTrxId", strOrgId);
+    Organization orgTrx = OBDal.getInstance().get(Organization.class, strOrgId);
+    xmlDocument.setParameter("orgTrxName", orgTrx.getIdentifier());
     xmlDocument.setParameter("finFinancialAccountId", strFinancialAccountId);
     xmlDocument.setParameter("finBankStatementLineId", strBankStatementLineId);
     String transactionType = "P";
@@ -448,6 +455,9 @@
     final String strCentrally = Utility.getContext(this, vars,
         DimensionDisplayUtility.IsAcctDimCentrally, strWindowId);
 
+    final String strElement_OT = Utility.getContext(this, vars, DimensionDisplayUtility
+        .displayAcctDimensions(strCentrally, DimensionDisplayUtility.DIM_Organization,
+            AcctServer.DOCTYPE_FinAccTransaction, DimensionDisplayUtility.DIM_Header), strWindowId);
     final String strElement_BP = Utility.getContext(this, vars, DimensionDisplayUtility
         .displayAcctDimensions(strCentrally, DimensionDisplayUtility.DIM_BPartner,
             AcctServer.DOCTYPE_FinAccTransaction, DimensionDisplayUtility.DIM_Header), strWindowId);
@@ -470,6 +480,7 @@
         .displayAcctDimensions(strCentrally, DimensionDisplayUtility.DIM_CostCenter,
             AcctServer.DOCTYPE_FinAccTransaction, DimensionDisplayUtility.DIM_Header), strWindowId);
 
+    xmlDocument.setParameter("strElement_OT", strElement_OT);
     xmlDocument.setParameter("strElement_BP", strElement_BP);
     xmlDocument.setParameter("strElement_PR", strElement_PR);
     xmlDocument.setParameter("strElement_PJ", strElement_PJ);
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -12,7 +12,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2012 Openbravo SLU
+ * All portions are Copyright (C) 2010-2014 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -46,12 +46,15 @@
     <PARAMETER id="paramDateTo" name="dateDisplayFormat" attribute="saveformat" replace="yy"/>
     
     <PARAMETER id="fieldOrg" name="orgId" attribute="value"/>
+    <PARAMETER id="AD_Org_ID" name="orgTrxId" attribute="value"/>
+    <PARAMETER id="AD_Org_ID" name="orgTrxName" attribute="identifier"/>
     <PARAMETER id="fieldWindowId" name="windowId" attribute="value"/>
     <PARAMETER id="fieldTabId" name="tabId" attribute="value"/>
     <PARAMETER id="fieldFinFinancialAccountId" name="finFinancialAccountId" attribute="value"/>
     <PARAMETER id="fieldFinBankStatementLineId" name="finBankStatementLineId" attribute="value"/>
     
     <!-- Accounting Dimensions -->
+    <PARAMETER id="paramStrElement_OT" name="strElement_OT" attribute="value"/>
     <PARAMETER id="paramStrElement_BP" name="strElement_BP" attribute="value"/>
     <PARAMETER id="paramStrElement_PR" name="strElement_PR" attribute="value"/>
     <PARAMETER id="paramStrElement_PJ" name="strElement_PJ" attribute="value"/>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java	Wed Feb 26 15:15:03 2014 +0100
@@ -558,12 +558,6 @@
    *          accounting dimension
    * @param salesRegion
    *          accounting dimension
-   * @param costCenter
-   *          accounting dimension
-   * @param user1
-   *          accounting dimension
-   * @param user2
-   *          accounting dimension
    */
   public static void saveGLItem(FIN_Payment payment, BigDecimal glitemAmount, GLItem glitem,
       BusinessPartner businessPartner, Product product, Project project, Campaign campaign,
@@ -669,9 +663,9 @@
    * 
    * @param vars
    *          VariablseSecureApp with the session data.
-   * @param selectedPaymentScheduleDetails
-   *          List of FIN_PaymentScheduleDetails that need to be included in the HashMap.
-   * @return A HashMap mapping the FIN_PaymentScheduleDetail's Id with the corresponding amount.
+   * @param selectedBaseOBObjects
+   *          List of bobs that need to be included in the HashMap.
+   * @return A HashMap mapping the Id with the corresponding amount.
    */
   public static <T extends BaseOBObject> HashMap<String, BigDecimal> getSelectedBaseOBObjectAmount(
       VariablesSecureApp vars, List<T> selectedBaseOBObjects, String htmlElementId)
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ReconciliationProcess.java	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ReconciliationProcess.java	Wed Feb 26 15:15:03 2014 +0100
@@ -110,25 +110,26 @@
 
         Boolean invoicePaidold = false;
         for (FIN_FinaccTransaction finacctransaction : reconciliation.getFINFinaccTransactionList()) {
-          for (FIN_PaymentDetail pd : finacctransaction.getFinPayment().getFINPaymentDetailList()) {
-            for (FIN_PaymentScheduleDetail psd : pd.getFINPaymentScheduleDetailList()) {
-              invoicePaidold = psd.isInvoicePaid();
-              if (!invoicePaidold) {
-                if ((FIN_Utility.invoicePaymentStatus(finacctransaction.getFinPayment()
-                    .getPaymentMethod(), reconciliation.getAccount(), finacctransaction
-                    .getFinPayment().isReceipt()).equals(finacctransaction.getFinPayment()
-                    .getStatus()))) {
-                  psd.setInvoicePaid(true);
-                }
-                if (psd.isInvoicePaid()) {
-                  FIN_Utility.updatePaymentAmounts(psd);
+          if (finacctransaction.getFinPayment() != null) {
+            for (FIN_PaymentDetail pd : finacctransaction.getFinPayment().getFINPaymentDetailList()) {
+              for (FIN_PaymentScheduleDetail psd : pd.getFINPaymentScheduleDetailList()) {
+                invoicePaidold = psd.isInvoicePaid();
+                if (!invoicePaidold) {
+                  if ((FIN_Utility.invoicePaymentStatus(finacctransaction.getFinPayment()
+                      .getPaymentMethod(), reconciliation.getAccount(), finacctransaction
+                      .getFinPayment().isReceipt()).equals(finacctransaction.getFinPayment()
+                      .getStatus()))) {
+                    psd.setInvoicePaid(true);
+                  }
+                  if (psd.isInvoicePaid()) {
+                    FIN_Utility.updatePaymentAmounts(psd);
+                  }
                 }
               }
             }
+            FIN_Utility.updateBusinessPartnerCredit(finacctransaction.getFinPayment());
           }
-          FIN_Utility.updateBusinessPartnerCredit(finacctransaction.getFinPayment());
         }
-
         // ***********************
         // Reactivate Reconciliation
         // ***********************
@@ -162,21 +163,23 @@
         Boolean invoicePaidold = false;
 
         for (FIN_FinaccTransaction finacctransaction : reconciliation.getFINFinaccTransactionList()) {
-          for (FIN_PaymentDetail pd : finacctransaction.getFinPayment().getFINPaymentDetailList()) {
-            for (FIN_PaymentScheduleDetail psd : pd.getFINPaymentScheduleDetailList()) {
-              invoicePaidold = psd.isInvoicePaid();
-              if (invoicePaidold) {
-                if (FIN_Utility.invoicePaymentStatus(
-                    finacctransaction.getFinPayment().getPaymentMethod(),
-                    reconciliation.getAccount(), finacctransaction.getFinPayment().isReceipt())
-                    .equals(finacctransaction.getFinPayment().getStatus())) {
-                  boolean restore = (FIN_Utility.seqnumberpaymentstatus(finacctransaction
-                      .getFinPayment().getStatus())) <= (FIN_Utility
-                      .seqnumberpaymentstatus(FIN_Utility.invoicePaymentStatus(finacctransaction
-                          .getFinPayment().getPaymentMethod(), reconciliation.getAccount(),
-                          finacctransaction.getFinPayment().isReceipt())));
-                  if (restore) {
-                    FIN_Utility.restorePaidAmounts(psd);
+          if (finacctransaction.getFinPayment() != null) {
+            for (FIN_PaymentDetail pd : finacctransaction.getFinPayment().getFINPaymentDetailList()) {
+              for (FIN_PaymentScheduleDetail psd : pd.getFINPaymentScheduleDetailList()) {
+                invoicePaidold = psd.isInvoicePaid();
+                if (invoicePaidold) {
+                  if (FIN_Utility.invoicePaymentStatus(
+                      finacctransaction.getFinPayment().getPaymentMethod(),
+                      reconciliation.getAccount(), finacctransaction.getFinPayment().isReceipt())
+                      .equals(finacctransaction.getFinPayment().getStatus())) {
+                    boolean restore = (FIN_Utility.seqnumberpaymentstatus(finacctransaction
+                        .getFinPayment().getStatus())) <= (FIN_Utility
+                        .seqnumberpaymentstatus(FIN_Utility.invoicePaymentStatus(finacctransaction
+                            .getFinPayment().getPaymentMethod(), reconciliation.getAccount(),
+                            finacctransaction.getFinPayment().isReceipt())));
+                    if (restore) {
+                      FIN_Utility.restorePaidAmounts(psd);
+                    }
                   }
                 }
               }
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java	Wed Feb 26 15:15:03 2014 +0100
@@ -1382,6 +1382,9 @@
   }
 
   public static void updateBusinessPartnerCredit(FIN_Payment payment) {
+    if (payment == null) {
+      return;
+    }
     // When credit is used (consumed) we compensate so_creditused as this amount is already
     // included in the payment details. Credit consumed should not affect to so_creditused
     if (payment.getGeneratedCredit().compareTo(BigDecimal.ZERO) == 0
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -6,7 +6,7 @@
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <NAME><![CDATA[JBoss Weld]]></NAME>
-<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.21974]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.22139]]></VERSION>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <DESCRIPTION><![CDATA[JBoss Weld]]></DESCRIPTION>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <HELP><![CDATA[Provides the JBoss Weld framework: Java Contexts and Dependency Injection for the Java EE platform (CDI). For more information see http://seamframework.org/Weld]]></HELP>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <URL><![CDATA[http://forge.openbravo.com/projects/weld]]></URL>
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -7,7 +7,7 @@
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.21974]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.22139]]></STARTVERSION>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_PROCESS.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_PROCESS.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -73,6 +73,10 @@
         <default><![CDATA[N]]></default>
         <onCreateDefault><![CDATA['N']]></onCreateDefault>
       </column>
+      <column name="IS_EXPLICIT_ACCESS" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault><![CDATA['N']]></onCreateDefault>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="OBUIAPP_PROC_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
@@ -85,5 +89,6 @@
       <check name="OBUIAPP_PROC_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="OBUIAPP_PROC_ISBACKGROUND_CHK"><![CDATA[ISBACKGROUND IN ('Y', 'N')]]></check>
       <check name="OBUIAPP_PROC_MULTI_CHK"><![CDATA[ISMULTIRECORD IN ('Y', 'N')]]></check>
+      <check name="OBUIAPP_PROCESS_EXPLICITACC_CK"><![CDATA[IS_EXPLICIT_ACCESS IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -497,6 +497,46 @@
 <!--10565D81EA4146F7AAE0293D387B6DC2-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--10565D81EA4146F7AAE0293D387B6DC2--></AD_COLUMN>
 
+<!--127F0488A8394E86A1D0822103FE1AB0--><AD_COLUMN>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <AD_COLUMN_ID><![CDATA[127F0488A8394E86A1D0822103FE1AB0]]></AD_COLUMN_ID>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <NAME><![CDATA[Requires Explicit Access Permission]]></NAME>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <DESCRIPTION><![CDATA[Requires Explicit Access Permission]]></DESCRIPTION>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <HELP><![CDATA[When processes are executed from a button in a window, by default, they inherit permissions granted to the window. So if the window is accessible it can be executed without the need of explicitly granting access for that role to the process.
+
+This behavior can be overwritten by the "Secured Process" preference.
+
+Processes with "Requires Explicit Access Permission" flag set to true, do not inherit permissions from the window but they always require the role to be explicitly granted to this process.]]></HELP>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <COLUMNNAME><![CDATA[Is_Explicit_Access]]></COLUMNNAME>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <AD_TABLE_ID><![CDATA[FF80818132D7FB620132D8129D1A0028]]></AD_TABLE_ID>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <SEQNO><![CDATA[190]]></SEQNO>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <AD_ELEMENT_ID><![CDATA[D2089AFD9A304F45BD5FCDFC617F138F]]></AD_ELEMENT_ID>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <POSITION><![CDATA[19]]></POSITION>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--127F0488A8394E86A1D0822103FE1AB0--></AD_COLUMN>
+
 <!--1330F77151CC4A9BBC1B0151F27952B9--><AD_COLUMN>
 <!--1330F77151CC4A9BBC1B0151F27952B9-->  <AD_COLUMN_ID><![CDATA[1330F77151CC4A9BBC1B0151F27952B9]]></AD_COLUMN_ID>
 <!--1330F77151CC4A9BBC1B0151F27952B9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2720,7 +2760,7 @@
 <!--5F26651D1F05498F9109026505AF297C-->  <COLUMNNAME><![CDATA[AD_Field_ID]]></COLUMNNAME>
 <!--5F26651D1F05498F9109026505AF297C-->  <AD_TABLE_ID><![CDATA[F167EB822B8A4284AC37D5B40B785D51]]></AD_TABLE_ID>
 <!--5F26651D1F05498F9109026505AF297C-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
-<!--5F26651D1F05498F9109026505AF297C-->  <AD_VAL_RULE_ID><![CDATA[9C6989B15CEA4987A502C0F5FF02B171]]></AD_VAL_RULE_ID>
+<!--5F26651D1F05498F9109026505AF297C-->  <AD_VAL_RULE_ID><![CDATA[E2D591AAE44F42A3964A07DC49C6AB84]]></AD_VAL_RULE_ID>
 <!--5F26651D1F05498F9109026505AF297C-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--5F26651D1F05498F9109026505AF297C-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--5F26651D1F05498F9109026505AF297C-->  <ISPARENT><![CDATA[N]]></ISPARENT>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -986,6 +986,38 @@
 <!--273F9EB0619742E6B75E57F1958F1033-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--273F9EB0619742E6B75E57F1958F1033--></AD_FIELD>
 
+<!--27E751EB37C841EC930FD493AB2CF64B--><AD_FIELD>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <AD_FIELD_ID><![CDATA[27E751EB37C841EC930FD493AB2CF64B]]></AD_FIELD_ID>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <NAME><![CDATA[Requires Explicit Access Permission]]></NAME>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <DESCRIPTION><![CDATA[Requires Explicit Access Permission]]></DESCRIPTION>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <HELP><![CDATA[When processes are executed from a button in a window, by default, they inherit permissions granted to the window. So if the window is accessible it can be executed without the need of explicitly granting access for that role to the process.
+
+This behavior can be overwritten by the "Secured Process" preference.
+
+Processes with "Requires Explicit Access Permission" flag set to true, do not inherit permissions from the window but they always require the role to be explicitly granted to this process.]]></HELP>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <AD_TAB_ID><![CDATA[FF80818132D7FB620132D819C1720046]]></AD_TAB_ID>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <AD_COLUMN_ID><![CDATA[127F0488A8394E86A1D0822103FE1AB0]]></AD_COLUMN_ID>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--27E751EB37C841EC930FD493AB2CF64B--></AD_FIELD>
+
 <!--2C3B28510C0544BC8BDA4461AE88C486--><AD_FIELD>
 <!--2C3B28510C0544BC8BDA4461AE88C486-->  <AD_FIELD_ID><![CDATA[2C3B28510C0544BC8BDA4461AE88C486]]></AD_FIELD_ID>
 <!--2C3B28510C0544BC8BDA4461AE88C486-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3663,7 +3695,7 @@
 <!--C5E25325FEAA4F2DBAFB4A7B443E4851-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--C5E25325FEAA4F2DBAFB4A7B443E4851-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
 <!--C5E25325FEAA4F2DBAFB4A7B443E4851-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--C5E25325FEAA4F2DBAFB4A7B443E4851-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--C5E25325FEAA4F2DBAFB4A7B443E4851-->  <SEQNO><![CDATA[500]]></SEQNO>
 <!--C5E25325FEAA4F2DBAFB4A7B443E4851-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--C5E25325FEAA4F2DBAFB4A7B443E4851-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--C5E25325FEAA4F2DBAFB4A7B443E4851-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -4647,7 +4679,7 @@
 <!--FCD55C499D894E95B322C17919EAB3E4-->  <DISPLAYLOGIC><![CDATA[@Uipattern@='M']]></DISPLAYLOGIC>
 <!--FCD55C499D894E95B322C17919EAB3E4-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
 <!--FCD55C499D894E95B322C17919EAB3E4-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--FCD55C499D894E95B322C17919EAB3E4-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--FCD55C499D894E95B322C17919EAB3E4-->  <SEQNO><![CDATA[110]]></SEQNO>
 <!--FCD55C499D894E95B322C17919EAB3E4-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--FCD55C499D894E95B322C17919EAB3E4-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--FCD55C499D894E95B322C17919EAB3E4-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -6,7 +6,7 @@
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <NAME><![CDATA[User Interface Application]]></NAME>
-<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.21974]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.22139]]></VERSION>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <DESCRIPTION><![CDATA[Provides the main application components for the openbravo user interface]]></DESCRIPTION>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <HELP><![CDATA[Provides the main application components for the openbravo user interface. The main layout incorporates a navigation bar and a main view area.]]></HELP>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <URL><![CDATA[http://forge.openbravo.com/projects/clientapplication]]></URL>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -7,7 +7,7 @@
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.21974]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.22139]]></STARTVERSION>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--60A170212F36499D83B8AD38D01F46B3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.21974]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.22139]]></STARTVERSION>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.21974]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.22139]]></STARTVERSION>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.21974]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.22139]]></STARTVERSION>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/WindowSettingsActionHandler.java	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/WindowSettingsActionHandler.java	Wed Feb 26 15:15:03 2014 +0100
@@ -11,7 +11,7 @@
  * under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2011-2012 Openbravo SLU 
+ * All portions are Copyright (C) 2011-2014 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -129,7 +129,10 @@
         }
       }
 
-      // Processes without access
+      // processes can be secured in 3 ways:
+      // - Secured preference is set: explicit grant is required
+      // - Process is marked as requiresExplicitAccessPermission: explicit grant is required
+      // - None of the above: permission is inherited from window
       boolean securedProcess = false;
       try {
         securedProcess = "Y".equals(Preferences.getPreferenceValue("SecuredProcess", true,
@@ -139,42 +142,54 @@
       } catch (PropertyException e) {
         // do nothing, property is not set so securedProcess is false
       }
-      if (securedProcess) {
-        OBQuery<Field> q = OBDal
-            .getInstance()
-            .createQuery(
-                Field.class,
-                " as f where  tab.window = :window "
-                    + "and ( (column.oBUIAPPProcess is not null"
-                    + " and not exists (select 1 from "
-                    + " OBUIAPP_Process_Access a"
-                    + " where a.obuiappProcess = f.column.oBUIAPPProcess"
-                    + " and a.role.id = :role and a.active=true))"
-                    + "or (column.process is not null and "
-                    + " not exists (select 1 from ADProcessAccess a where a.process = f.column.process and "
-                    + " a.role.id = :role and a.active=true)))" + " order by f.tab");
 
-        q.setNamedParameter("window", window);
-        q.setNamedParameter("role", OBContext.getOBContext().getRole().getId());
+      String restrictedProcessesQry = " as f where  tab.window = :window and tab.active = true and (";
 
-        final JSONArray processes = new JSONArray();
-        json.put("notAccessibleProcesses", processes);
-        Tab tab = null;
-        JSONObject t;
-        JSONArray ps = null;
-        for (Field f : q.list()) {
-          if (tab == null || !tab.getId().equals(f.getTab().getId())) {
-            t = new JSONObject();
-            tab = f.getTab();
-            ps = new JSONArray();
-            t.put("tabId", tab.getId());
-            t.put("processes", ps);
-            processes.put(t);
-          }
-          final Entity entity = ModelProvider.getInstance().getEntityByTableId(
-              f.getTab().getTable().getId());
-          ps.put(KernelUtils.getProperty(f).getName());
+      restrictedProcessesQry += "(column.oBUIAPPProcess is not null";
+      if (!securedProcess) {
+        // not secured, restrict only those that require explicit permission
+        // subquery required to prevent inner join due to compound path check
+        // (process.requiresExplicitAccessPermission)
+        restrictedProcessesQry += " and exists (select 1 from OBUIAPP_Process p where p = f.column.oBUIAPPProcess and requiresExplicitAccessPermission = true) ";
+      }
+      restrictedProcessesQry += " and not exists (select 1 from " //
+          + " OBUIAPP_Process_Access a"
+          + " where a.obuiappProcess = f.column.oBUIAPPProcess"
+          + " and a.role.id = :role and a.active=true))"//
+
+          + " or (column.process is not null ";
+
+      if (!securedProcess) {
+        // not secured, restrict only those that require explicit permission
+        // subquery required to prevent inner join due to compound path check
+        // (process.requiresExplicitAccessPermission)
+        restrictedProcessesQry += " and exists (select 1 from ADProcess p where p = f.column.process and requiresExplicitAccessPermission = true) ";
+      }
+
+      restrictedProcessesQry += " and not exists (select 1 from ADProcessAccess a where a.process = f.column.process and "
+          + " a.role.id = :role and a.active=true))";
+
+      restrictedProcessesQry += ")  order by f.tab";
+
+      OBQuery<Field> q = OBDal.getInstance().createQuery(Field.class, restrictedProcessesQry);
+      q.setNamedParameter("window", window);
+      q.setNamedParameter("role", OBContext.getOBContext().getRole().getId());
+
+      final JSONArray processes = new JSONArray();
+      json.put("notAccessibleProcesses", processes);
+      Tab tab = null;
+      JSONObject t;
+      JSONArray ps = null;
+      for (Field f : q.list()) {
+        if (tab == null || !tab.getId().equals(f.getTab().getId())) {
+          t = new JSONObject();
+          tab = f.getTab();
+          ps = new JSONArray();
+          t.put("tabId", tab.getId());
+          t.put("processes", ps);
+          processes.put(t);
         }
+        ps.put(KernelUtils.getProperty(f).getName());
       }
 
       return json;
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/process/BaseProcessActionHandler.java	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/process/BaseProcessActionHandler.java	Wed Feb 26 15:15:03 2014 +0100
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2013 Openbravo SLU
+ * All portions are Copyright (C) 2010-2014 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -100,20 +100,38 @@
     }
   }
 
+  /**
+   * Permissions to processes can be given in 2 ways:
+   * <p>
+   * Explicit grant to process definition access:
+   * <ul>
+   * <li>whenever the process is directly executed from menu
+   * <li>in case the process is marked as "Requires Explicit Access Permission"
+   * <li>in case there is a "Secured Process" preference for current window
+   * </ul>
+   * <p>
+   * Inherited from window access in case it is invoked from a window button and none of the
+   * previous conditions is satisfied.
+   * 
+   */
   private boolean hasAccess(Process processDefinition, Map<String, Object> parameters) {
     String windowId = (String) parameters.get("windowId");
     if (windowId != null && !"null".equals(windowId)) {
       Window window = OBDal.getInstance().get(Window.class, windowId);
-      boolean securedProcess = false;
-      try {
-        securedProcess = "Y".equals(Preferences.getPreferenceValue("SecuredProcess", true,
-            OBContext.getOBContext().getCurrentClient(), OBContext.getOBContext()
-                .getCurrentOrganization(), OBContext.getOBContext().getUser(), OBContext
-                .getOBContext().getRole(), window));
-      } catch (PropertyException e) {
-        // do nothing, property is not set so securedProcess is false
+
+      boolean checkPermission = processDefinition.isRequiresExplicitAccessPermission();
+
+      if (!checkPermission) {
+        try {
+          checkPermission = "Y".equals(Preferences.getPreferenceValue("SecuredProcess", true,
+              OBContext.getOBContext().getCurrentClient(), OBContext.getOBContext()
+                  .getCurrentOrganization(), OBContext.getOBContext().getUser(), OBContext
+                  .getOBContext().getRole(), window));
+        } catch (PropertyException e) {
+          // do nothing, property is not set so securedProcess is false
+        }
       }
-      if (!securedProcess) {
+      if (!checkPermission) {
         // check if window is accessible
         OBCriteria<WindowAccess> qAccess = OBDal.getInstance().createCriteria(WindowAccess.class);
         qAccess.add(Restrictions.eq(WindowAccess.PROPERTY_WINDOW, window));
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java	Wed Feb 26 15:15:03 2014 +0100
@@ -1626,7 +1626,7 @@
   private String parseCalloutResponse(String calloutResponse, List<NativeArray> returnedArray) {
     String initS = "id=\"paramArray\">";
     String resp = calloutResponse.substring(calloutResponse.indexOf(initS) + initS.length());
-    resp = resp.substring(0, resp.indexOf("</")).trim();
+    resp = resp.substring(0, resp.indexOf("</SCRIPT")).trim();
     if (!resp.contains("new Array(") && !resp.contains("[[")) {
       return null;
     }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js	Wed Feb 26 15:15:03 2014 +0100
@@ -55,6 +55,7 @@
     displayField: OB.Constants.IDENTIFIER,
     canFilter: true,
     canEdit: false,
+    escapeHTML: true,
     filterOnKeypress: true,
     filterEditorType: 'OBFKFilterTextItem',
     type: '_id_19'
@@ -63,6 +64,7 @@
     title: OB.I18N.getLabel('OBUIAPP_AlertGrid_Alert'),
     canFilter: true,
     canEdit: false,
+    escapeHTML: true,
     filterOnKeypress: true,
     filterEditorType: 'OBTextItem',
     type: '_id_10'
@@ -78,6 +80,7 @@
     title: OB.I18N.getLabel('OBUIAPP_AlertGrid_Note'),
     canFilter: true,
     canEdit: true,
+    escapeHTML: true,
     filterOnKeypress: true,
     filterEditorType: 'OBTextItem',
     editorType: 'OBTextItem',
@@ -93,6 +96,7 @@
     title: OB.I18N.getLabel('OBUIAPP_AlertGrid_Record'),
     canFilter: true,
     canEdit: false,
+    escapeHTML: true,
     clientClass: 'OBAlertGridCanvasItem_Link',
     filterOnKeypress: true,
     filterEditorType: 'OBTextItem',
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-characteristics.js	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-characteristics.js	Wed Feb 26 15:15:03 2014 +0100
@@ -333,8 +333,18 @@
       selectionChanged: function () {
         me.fireOnPause('updateCharacteristicsText', function () {
           //fire on pause because selecting a node raises several time selectionChanged to select its parants
-          me.selectionVisualization.setContents(isc.OBCharacteristicsFilterItem.getDisplayValue(me.getValue()));
+          me.selectionVisualization.setContents(isc.OBCharacteristicsFilterItem.getDisplayValue(me.getValue()).asHTML());
         }, 100);
+      },
+
+      setDataSource: function (ds, fields) {
+        var treeField;
+        if (!fields || fields.length === 0) {
+          treeField = isc.shallowClone(isc.TreeGrid.TREE_FIELD);
+          treeField.escapeHTML = true;
+          fields = [treeField];
+        }
+        return this.Super("setDataSource", [ds, fields]);
       }
     });
 
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js	Wed Feb 26 15:15:03 2014 +0100
@@ -167,7 +167,8 @@
   // are being used
   getPickListFields: function () {
     return [{
-      name: this.displayField
+      name: this.displayField,
+      escapeHTML: true
     }];
   },
 
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list.js	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list.js	Wed Feb 26 15:15:03 2014 +0100
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2011-2013 Openbravo SLU
+ * All portions are Copyright (C) 2011-2014 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -131,7 +131,7 @@
     for (i = 0; i < length; i++) {
       id = entries[i][OB.Constants.ID] || '';
       identifier = entries[i][OB.Constants.IDENTIFIER] || '';
-      valueMap[id] = identifier;
+      valueMap[id] = identifier.asHTML();
       this.entries[i] = {};
       this.entries[i][valueField] = id;
     }
@@ -179,7 +179,7 @@
         }
       } else if (this.valueMap[value]) {
         this.lastSelectedValue = value;
-        return this.valueMap[value];
+        return this.valueMap[value].unescapeHTML();
       }
     }
 
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js	Wed Feb 26 15:15:03 2014 +0100
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2011-2013 Openbravo SLU
+ * All portions are Copyright (C) 2011-2014 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -89,9 +89,14 @@
 
   setTodaysDate: function (date) {
     var today = new Date();
+    // Set the month initially to January to prevent error like this
+    // provided date: 15/02/2014
+    // today: 31/03/2014
+    // date.setDate(today.getDate()) would result in Mon Mar 02 2014 18:00:00 GMT+0100 (CET), because february does not have 31 days 
+    date.setMonth(0);
+    date.setDate(today.getDate());
+    date.setMonth(today.getMonth());
     date.setYear(today.getFullYear());
-    date.setMonth(today.getMonth());
-    date.setDate(today.getDate());
   },
 
   /* The following functions allow proper timeGrid operation */
@@ -170,7 +175,7 @@
     var UTCOffsetInMiliseconds;
     if (this.getValue() !== data[this.name]) {
       // it has not been converted to the local time yet, do it now
-      if (data[this.name].getFullYear() === 1970) {
+      if (data[this.name] && data[this.name].getFullYear() <= 1970) {
         UTCOffsetInMiliseconds = OB.Utilities.Date.getUTCOffsetInMiliseconds();
         data[this.name].setTime(data[this.name].getTime() + UTCOffsetInMiliseconds);
       }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js	Wed Feb 26 15:15:03 2014 +0100
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2011-2012 Openbravo SLU
+ * All portions are Copyright (C) 2011-2014 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -572,7 +572,7 @@
       var attachment = attachments[i];
       var buttonLayout = isc.HLayout.create();
       var attachmentLabel = isc.Label.create({
-        contents: attachment.name,
+        contents: attachment.name.asHTML(),
         className: 'OBNoteListGrid',
         width: '200px',
         height: 20,
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-notes.js	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-notes.js	Wed Feb 26 15:15:03 2014 +0100
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2011-2013 Openbravo SLU
+ * All portions are Copyright (C) 2011-2014 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s): Valery Lezhebokov.
  ************************************************************************
@@ -396,7 +396,11 @@
           return value;
         }
 
-        value = value + ' <span class="OBNoteListGridAuthor">' + OB.Utilities.getTimePassedInterval(record.recordTime - record.creationDate.getTime()) + ' ' + OB.I18N.getLabel('OBUIAPP_by') + ' ' + record['createdBy' + OB.Constants.FIELDSEPARATOR + OB.Constants.IDENTIFIER] + '</span>';
+        if (value && value.asHTML) {
+          value = value.asHTML();
+        }
+
+        value = value + ' <span class="OBNoteListGridAuthor">' + OB.Utilities.getTimePassedInterval(record.recordTime - record.creationDate.getTime()) + ' ' + OB.I18N.getLabel('OBUIAPP_by') + ' ' + record['createdBy' + OB.Constants.FIELDSEPARATOR + OB.Constants.IDENTIFIER].asHTML() + '</span>';
 
         // show delete link if the note was created by
         // the current user
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Wed Feb 26 15:15:03 2014 +0100
@@ -205,7 +205,7 @@
     fetchRemoteData: function (serverCriteria, startRow, endRow) {
       // clone to prevent side effects
       var requestProperties = isc.clone(this.context);
-      this.grid.getFetchRequestParams(requestProperties.params);
+      this.context.params = this.grid.getFetchRequestParams(requestProperties.params);
 
       return this.Super('fetchRemoteData', arguments);
     },
@@ -233,7 +233,7 @@
     },
 
     transformData: function (newData, dsResponse) {
-      var i, length, timeFields, responseToFilter;
+      var i, length, timeFields, responseToFilter, newTotalRows;
 
       // when the data is received from the datasource, time fields are formatted in UTC time. They have to be converted to local time
       if (dsResponse && dsResponse.context && (dsResponse.context.operationType === 'fetch' || dsResponse.context.operationType === 'update' || dsResponse.context.operationType === 'add')) {
@@ -256,14 +256,22 @@
 
       if (this.localData && !responseToFilter) {
         length = this.localData.length;
+        newTotalRows = dsResponse.totalRows;
         for (i = dsResponse.endRow + 1; i < length; i++) {
           if (!Array.isLoading(this.localData[i]) && this.localData[i]) {
-            dsResponse.totalRows = i + 1;
+            newTotalRows = i + 1;
           } else {
             break;
           }
         }
 
+        // never decrease totalRows because when multiple requests are obtained it can
+        // cause an incorrect computation of the whole data size
+        if (newTotalRows > dsResponse.totalRows) {
+          dsResponse.totalRows = newTotalRows + 1;
+          // increase one to request additional page to backend
+        }
+
         // get rid of old loading markers, this has to be done explicitly
         // as we can return another rowset than requested
         // call with a delay otherwise the grid will keep requesting rows while processing the
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Wed Feb 26 15:15:03 2014 +0100
@@ -1391,10 +1391,10 @@
           if (this.childTabSet.visibility === 'hidden') {
             this.childTabSet.show();
             if (tabViewPane.showTabIf && !tabViewPane.data && !tabViewPane.refreshingData && tabViewPane.isVisible()) {
-                // If the child tab does not have data yet, refresh it
-                tabViewPane.refreshingData = true;
-                tabViewPane.refresh();
-              }
+              // If the child tab does not have data yet, refresh it
+              tabViewPane.refreshingData = true;
+              tabViewPane.refresh();
+            }
           }
           this.childTabSet.tabBar.members[i].show();
           tabViewPane.hidden = false;
@@ -1566,9 +1566,8 @@
     }
 
     if (title) {
-
       // show a prompt with the title info
-      tab.prompt = title;
+      tab.prompt = title.asHTML();
       tab.showPrompt = true;
       tab.hoverWidth = 150;
 
@@ -2198,11 +2197,16 @@
   convertToDate: function (stringValue) {
     var today = new Date(),
         dateValue = isc.Time.parseInput(stringValue);
+    // Set the month initially to January to prevent error like this
+    // provided date: 15/02/2014
+    // today: 31/03/2014
+    // date.setDate(today.getDate()) would result in Mon Mar 02 2014 18:00:00 GMT+0100 (CET), because february does not have 31 days 
+    dateValue.setMonth(0);
     // Only the time is relevant. In order to be able to convert it from UTC to local time
     //   properly the date value should be today's date
+    dateValue.setDate(today.getDate());
+    dateValue.setMonth(today.getMonth());
     dateValue.setYear(today.getFullYear());
-    dateValue.setMonth(today.getMonth());
-    dateValue.setDate(today.getDate());
     return dateValue;
   },
 
@@ -2243,8 +2247,10 @@
           grid = me.viewGrid,
           currentRecord, currentID;
       currentRecord = grid.getSelectedRecord();
-      context.rowNum = grid.getRecordIndex(currentRecord);
-      currentID = currentRecord[OB.Constants.ID];
+      if (currentRecord) {
+        context.rowNum = grid.getRecordIndex(currentRecord);
+        currentID = currentRecord[OB.Constants.ID];
+      }
       context.grid = grid;
       response.clientContext = context;
       if (originalID === currentID) {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js	Wed Feb 26 15:15:03 2014 +0100
@@ -401,6 +401,9 @@
       for (t = 0; t < data.notAccessibleProcesses.length; t++) {
         notAccessibleProcesses = data.notAccessibleProcesses[t];
         view = this.getView(notAccessibleProcesses.tabId);
+        if (!view) {
+          continue;
+        }
         for (i = 0; i < view.toolBar.rightMembers.length; i++) {
           button = view.toolBar.rightMembers[i];
           if (notAccessibleProcesses.tabId === button.contextView.tabId && button.property && notAccessibleProcesses.processes.contains(button.property)) {
@@ -413,7 +416,7 @@
               }
               for (stBtns = 0; stBtns < stView.toolBar.rightMembers.length; stBtns++) {
                 stBtn = stView.toolBar.rightMembers[stBtns];
-                if (stBtn.contextView === button.contextView && stBtn.property && notAccessibleProcesses.processes.contains(stBtn.property)) {
+                if (stBtn.contextView === button.contextView && stBtn.property && stBtn.property === button.property && notAccessibleProcesses.processes.contains(stBtn.property)) {
                   stBtn.readOnlyIf = alwaysReadOnly;
                   break;
                 }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/materialmgmt/ob-reservedGoodMovement.js	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/materialmgmt/ob-reservedGoodMovement.js	Wed Feb 26 15:15:03 2014 +0100
@@ -20,7 +20,7 @@
 OB.ReservedGoodMovement = OB.ReservedGoodMovement || {};
 
 /**
- * Check that entered movementqty is not higher than (ReservedQty-releasedQty). 
+ * Check that entered movementqty is not higher than (ReservedQty-releasedQty).
  * Check that entered movementqty is higher than 0
  */
 OB.ReservedGoodMovement.QuantityValidate = function (item, validator, value, record) {
@@ -50,7 +50,7 @@
 };
 
 /**
- * Check that entered storageBin is different from actual storageBin. 
+ * Check that entered storageBin is different from actual storageBin.
  * Check that entered storageBin is not null
  */
 
@@ -69,4 +69,4 @@
   }
 
   return true;
-};
+};
\ No newline at end of file
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-user-profile-widget.js	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-user-profile-widget.js	Wed Feb 26 15:15:03 2014 +0100
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2013 Openbravo SLU
+ * All portions are Copyright (C) 2010-2014 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -78,9 +78,11 @@
     // ** {{{ setPrompt }}} **
     // Shown on hover, shows some user information.
     if (!OB.User.isPortal) {
-      this.setPrompt('<b>' + OB.I18N.getLabel('UINAVBA_Role') + '</b>: ' + OB.User.roleName + '<br/>' + '<b>' + OB.I18N.getLabel('UINAVBA_Client') + '</b>: ' + OB.User.clientName + '<br/>' + '<b>' + OB.I18N.getLabel('UINAVBA_Organization') + '</b>: ' + OB.User.organizationName);
+      this.setPrompt('<b>' + OB.I18N.getLabel('UINAVBA_Role') + '</b>: ' + OB.User.roleName.asHTML() + '<br/>' + '<b>' + OB.I18N.getLabel('UINAVBA_Client') + '</b>: ' + OB.User.clientName.asHTML() + '<br/>' + '<b>' + OB.I18N.getLabel('UINAVBA_Organization') + '</b>: ' + OB.User.organizationName.asHTML());
     }
 
+    this.title = this.title.asHTML();
+
     this.Super('initWidget', arguments);
     OB.TestRegistry.register('org.openbravo.client.application.navigationbarcomponents.UserProfileButton', this);
   },
@@ -150,7 +152,7 @@
         for (i = 0; i < length; i++) {
           id = entries[i][OB.Constants.ID] || '';
           identifier = entries[i][OB.Constants.IDENTIFIER] || '';
-          valueMap[id] = identifier;
+          valueMap[id] = identifier.convertTags();
           this.entries[i] = {};
           this.entries[i][valueField] = id;
         }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js	Wed Feb 26 15:15:03 2014 +0100
@@ -162,6 +162,12 @@
       contextView.getTabMessage();
       contextView.toolBar.refreshCustomButtons();
 
+      if (contextView && contextView.viewGrid && contextView.viewGrid.discardAllEdits) {
+        // discard edits coming from FIC as they pollute the state and they're already
+        // reloaded
+        contextView.viewGrid.discardAllEdits();
+      }
+
       if (contextView !== currentView && currentView.state === isc.OBStandardView.STATE_TOP_MAX) {
         // Executing an action defined in parent tab, current tab is maximized,
         // let's set half for each in order to see the message
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js	Wed Feb 26 15:15:03 2014 +0100
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2011-2013 Openbravo SLU
+ * All portions are Copyright (C) 2011-2014 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -80,9 +80,14 @@
 // example
 OB.Utilities.truncTitle = function (title, cutLength, suffix) {
   cutLength = cutLength || 30;
-  if (!title || title.length < cutLength) {
+  if (!title) {
     return title;
   }
+
+  if (title.length < cutLength) {
+    return title.asHTML();
+  }
+
   var newTitle = title.substring(0, cutLength);
   // To remove ugly title ends
   while (newTitle.length > 4 && (newTitle.lastIndexOf(' - ') === newTitle.length - 3 || newTitle.lastIndexOf(' -') === newTitle.length - 2 || newTitle.lastIndexOf('  ') === newTitle.length - 2)) {
@@ -97,7 +102,7 @@
     }
   }
   newTitle += suffix || '...';
-  return newTitle;
+  return newTitle.asHTML();
 };
 
 // ** {{{OB.Utilities.createDialog}}} **
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -6,7 +6,7 @@
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <NAME><![CDATA[HTML Widget]]></NAME>
-<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.21974]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.22139]]></VERSION>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <DESCRIPTION><![CDATA[Provides the HTML Widget superclass that allows to create widget classes that embed the html code.]]></DESCRIPTION>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <HELP><![CDATA[With this module you can define your own widget classes just setting up your own html code or the html code provided by third parties.]]></HELP>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <URL><![CDATA[http://forge.openbravo.com/projects/htmlwidget]]></URL>
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -7,7 +7,7 @@
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <AD_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_MODULE_ID>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.21974]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.22139]]></STARTVERSION>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -6,7 +6,7 @@
 <!--4B828F4D03264080AA1D2057B13F613C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <NAME><![CDATA[User Interface Client Kernel]]></NAME>
-<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.21974]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.22139]]></VERSION>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <DESCRIPTION><![CDATA[Provides framework functionality for the Openbravo User Interface]]></DESCRIPTION>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <HELP><![CDATA[The user interface client kernel is a generation framework for generating client (browser) components used in Openbravo. Its components are mainly used by other modules to provide customizable and extendable user interfaces.]]></HELP>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravoclientkernel]]></URL>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -7,7 +7,7 @@
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.21974]]></STARTVERSION>
+<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.22139]]></STARTVERSION>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.21974]]></STARTVERSION>
+<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.22139]]></STARTVERSION>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <AD_DEPENDENT_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_DEPENDENT_MODULE_ID>
-<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.21974]]></STARTVERSION>
+<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.22139]]></STARTVERSION>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.kernel/src-test/org/openbravo/client/kernel/freemarker/test/LabelTest.java	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.kernel/src-test/org/openbravo/client/kernel/freemarker/test/LabelTest.java	Wed Feb 26 15:15:03 2014 +0100
@@ -29,6 +29,7 @@
 import org.openbravo.client.kernel.Component;
 import org.openbravo.client.kernel.ComponentGenerator;
 import org.openbravo.client.kernel.ComponentProvider;
+import org.openbravo.client.kernel.I18NComponent;
 import org.openbravo.client.kernel.KernelComponentProvider;
 import org.openbravo.client.kernel.KernelConstants;
 import org.openbravo.dal.core.OBContext;
@@ -39,8 +40,8 @@
 import org.openbravo.model.ad.ui.MessageTrl;
 
 /**
- * Test the {@link labelComponent}, test that a translated label actually is used inside of the
- * label template.
+ * Test the {@link I18NComponent}, test that a translated label actually is used inside of the label
+ * template.
  * 
  * @author mtaal
  */
--- a/modules/org.openbravo.client.kernel/src-test/org/openbravo/client/kernel/test/KernelUtilTest.java	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.kernel/src-test/org/openbravo/client/kernel/test/KernelUtilTest.java	Wed Feb 26 15:15:03 2014 +0100
@@ -72,7 +72,7 @@
   }
 
   /**
-   * Test generation of the version id number {@link KernelUtils#getVersionString()}.
+   * Test generation of the version id number {@link KernelUtils#getVersionParameters(Module)}.
    * 
    * @throws Exception
    */
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponent.java	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponent.java	Wed Feb 26 15:15:03 2014 +0100
@@ -255,8 +255,6 @@
 
   /**
    * Override this method if the component is in a different package than the module.
-   * 
-   * @return
    */
   protected String getModulePackageName() {
     return this.getClass().getPackage().getName();
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponentProvider.java	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponentProvider.java	Wed Feb 26 15:15:03 2014 +0100
@@ -88,8 +88,6 @@
 
   /**
    * Override this method if the component is in a different package than the module.
-   * 
-   * @return
    */
   protected String getModulePackageName() {
     return this.getClass().getPackage().getName();
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseTemplateProcessor.java	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseTemplateProcessor.java	Wed Feb 26 15:15:03 2014 +0100
@@ -121,7 +121,6 @@
    * 
    * @param template
    * @param source
-   * @return
    */
   protected synchronized T createSetFreeMarkerTemplateInCache(Template template, String source) {
     final T specificTemplate = createTemplateImplementation(template, source);
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/PasswordUIDefinition.java	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/PasswordUIDefinition.java	Wed Feb 26 15:15:03 2014 +0100
@@ -25,8 +25,8 @@
  * both encrypted (reversible) and hashed storage of passwords.
  * 
  * @author shuehner
- * @See org.openbravo.base.model.domaintype.HashedStringDomainType
- * @See org.openbravo.base.model.domaintype.EncryptedStringDomainType
+ * @see org.openbravo.base.model.domaintype.HashedStringDomainType
+ * @see org.openbravo.base.model.domaintype.EncryptedStringDomainType
  */
 public class PasswordUIDefinition extends StringUIDefinition {
 
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java	Wed Feb 26 15:15:03 2014 +0100
@@ -363,7 +363,6 @@
    * @param field
    *          the field to generate the filter editor properties for, note it is allowed to pass
    *          null, implementors should gracefully handle this.
-   * @return
    */
   protected String getFilterEditorPropertiesProperty(Field field) {
     return "";
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -6,7 +6,7 @@
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <NAME><![CDATA[Workspace & Widgets]]></NAME>
-<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.21974]]></VERSION>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.22139]]></VERSION>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <DESCRIPTION><![CDATA[Workspace & Widgets]]></DESCRIPTION>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <HELP><![CDATA[Provides the infrastructure of workspace tab (formerly My Openbravo)]]></HELP>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <URL><![CDATA[http://forge.openbravo.com/projects/myopenbravo]]></URL>
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -7,7 +7,7 @@
 <!--15F51F03882F444CAB6593B4566DC929-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--15F51F03882F444CAB6593B4566DC929-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--15F51F03882F444CAB6593B4566DC929-->  <AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID>
-<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.21974]]></STARTVERSION>
+<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.22139]]></STARTVERSION>
 <!--15F51F03882F444CAB6593B4566DC929-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--15F51F03882F444CAB6593B4566DC929-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Application]]></DEPENDANT_MODULE_NAME>
 <!--15F51F03882F444CAB6593B4566DC929-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.21974]]></STARTVERSION>
+<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.22139]]></STARTVERSION>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoActionHandler.java	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoActionHandler.java	Wed Feb 26 15:15:03 2014 +0100
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2011 Openbravo SLU
+ * All portions are Copyright (C) 2010-2014 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -175,7 +175,7 @@
     if (widgets.length() == 0) {
       message.setType("Warning");
       message.setMessage("OBKMO_NoInstancesFound");
-      log.warn(">> No instances found.");
+      log.debug(">> No instances found.");
     }
 
   }
--- a/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponent.java	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponent.java	Wed Feb 26 15:15:03 2014 +0100
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2013 Openbravo SLU
+ * All portions are Copyright (C) 2010-2014 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -36,7 +36,6 @@
 import org.codehaus.jettison.json.JSONObject;
 import org.openbravo.base.exception.OBException;
 import org.openbravo.client.application.ApplicationUtils;
-import org.openbravo.client.application.Parameter;
 import org.openbravo.client.kernel.BaseTemplateComponent;
 import org.openbravo.client.kernel.Template;
 import org.openbravo.dal.core.DalUtil;
@@ -106,7 +105,6 @@
       final List<JSONObject> definitions = new ArrayList<JSONObject>();
       final List<String> tmp = new ArrayList<String>();
       String classDef = "";
-      boolean hasNullMandatory = false;
       final OBQuery<WidgetClass> widgetClassesQry = OBDal.getInstance().createQuery(
           WidgetClass.class, WidgetClass.PROPERTY_SUPERCLASS + " is false");
       for (WidgetClass widgetClass : widgetClassesQry.list()) {
@@ -115,23 +113,8 @@
           if (!widgetProvider.validate()) {
             continue;
           }
-          // If fetching the widgets of the own workspace, there is no need
-          // to filter out the widgets with null mandatory parameters
-          if (!isAdminMode) {
-            definitions.add(widgetProvider.getWidgetClassDefinition());
-          } else {
-            for (Parameter p : widgetClass.getOBUIAPPParameterEMObkmoWidgetClassIDList()) {
-              if (p.isMandatory() && p.getDefaultValue() == null) {
-                hasNullMandatory = true;
-                break;
-              }
-            }
-            if (!hasNullMandatory) {
-              definitions.add(widgetProvider.getWidgetClassDefinition());
-            } else {
-              hasNullMandatory = false;
-            }
-          }
+
+          definitions.add(widgetProvider.getWidgetClassDefinition());
 
           try {
             classDef = widgetProvider.generate();
--- a/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js	Wed Feb 26 15:15:03 2014 +0100
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2013 Openbravo SLU
+ * All portions are Copyright (C) 2010-2014 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -561,7 +561,7 @@
             width: '100%',
             showHover: true,
             showPrompt: true,
-            prompt: recent.tabTitle + ' - ' + recent.recentTitle,
+            prompt: (recent.tabTitle + ' - ' + recent.recentTitle).asHTML(),
             baseStyle: OB.Styles.OBMyOpenbravo.recentDocumentsLayout.Label.baseStyle,
             handleClick: handleClickFunction,
             iconOrientation: 'left',
@@ -760,6 +760,11 @@
         }
       }
     }
+
+    if (OB.MyOB.leftColumnLayout.addWigetSelector) {
+      // after updating cache lets reflect it in the drop down list if present
+      OB.MyOB.leftColumnLayout.addWigetSelector.refreshAvailableWidgets();
+    }
   },
 
   // ** {{{ updateWidgetsCache }} **
@@ -1013,21 +1018,21 @@
     this.Super('destroy', arguments);
   },
 
+  // ** {{{ refreshAvailableWidgets }} **
+  //
+  // Is called when after refreshing the cache of available widget classes
+  // to reflect the available widgets in the drop down list
+  //
+  refreshAvailableWidgets: function () {
+    var i, availableWidgetsMap = {},
+        widgetClasses = OB.MyOB.availableWidgetClasses;
+    for (i = 0; i < widgetClasses.length; i++) {
+      availableWidgetsMap[i] = widgetClasses[i].title;
+    }
+    this.form.setValueMap('widget', availableWidgetsMap);
+  },
+
   createDialogContents: function (rpcResponse, data, rpcRequest) {
-    var i, widgetClasses, availableWidgetsMap = {};
-
-    if (data && data.availableWidgetClasses) {
-      OB.MyOB.updateClassesCache(data.availableWidgetClasses);
-      widgetClasses = OB.MyOB.availableWidgetClasses;
-      for (i = 0; i < widgetClasses.length; i++) {
-        availableWidgetsMap[i] = widgetClasses[i].title;
-      }
-    }
-
-    if (this.loadingLabel) {
-      this.loadingLabel.destroy();
-    }
-
     this.form = isc.DynamicForm.create({
       width: '100%',
       height: 1,
@@ -1058,7 +1063,7 @@
         titleSuffix: '',
         requiredTitleSuffix: '',
         type: 'select',
-        valueMap: availableWidgetsMap,
+        valueMap: {},
         changed: function (form, item, value) {
           if (value) {
             form.parentElement.parentElement.buttonsLayout.getMember(0).setDisabled(false);
@@ -1067,6 +1072,16 @@
       }]
     });
 
+    OB.MyOB.leftColumnLayout.addWigetSelector = this;
+
+    if (data && data.availableWidgetClasses) {
+      OB.MyOB.updateClassesCache(data.availableWidgetClasses);
+    }
+
+    if (this.loadingLabel) {
+      this.loadingLabel.destroy();
+    }
+
     this.addItem(this.form);
 
     this.buttonsLayout.addMember(isc.OBFormButton.create({
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -6,7 +6,7 @@
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <NAME><![CDATA[Query/List Widget]]></NAME>
-<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.21974]]></VERSION>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.22139]]></VERSION>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <DESCRIPTION><![CDATA[Provides the Query/List superclass widget that allows to create widget classes that prints a grid of data based on a query.]]></DESCRIPTION>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <HELP><![CDATA[With this module you can define your own widget classes that just with simple Application Dictionary shows a grid of data based on a HQL Query.]]></HELP>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <URL><![CDATA[http://forge.openbravo.com/projects/querylistwidget]]></URL>
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -7,7 +7,7 @@
 <!--26558497C31140BFAB067BA4BC47D799-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--26558497C31140BFAB067BA4BC47D799-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
 <!--26558497C31140BFAB067BA4BC47D799-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.21974]]></STARTVERSION>
+<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.22139]]></STARTVERSION>
 <!--26558497C31140BFAB067BA4BC47D799-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -6,7 +6,7 @@
 <!--FF8080812D842086012D844F3CC0003E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080812D842086012D844F3CC0003E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080812D842086012D844F3CC0003E-->  <NAME><![CDATA[Widgets Collection]]></NAME>
-<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.21974]]></VERSION>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.22139]]></VERSION>
 <!--FF8080812D842086012D844F3CC0003E-->  <DESCRIPTION><![CDATA[Collection of Workspace Widgets]]></DESCRIPTION>
 <!--FF8080812D842086012D844F3CC0003E-->  <HELP><![CDATA[Collection of Workspace Widgets]]></HELP>
 <!--FF8080812D842086012D844F3CC0003E-->  <URL><![CDATA[http://forge.openbravo.com/projects/widgetscollection]]></URL>
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -7,7 +7,7 @@
 <!--FF8080812D842086012D845002070046-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080812D842086012D845002070046-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
 <!--FF8080812D842086012D845002070046-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.21974]]></STARTVERSION>
+<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.22139]]></STARTVERSION>
 <!--FF8080812D842086012D845002070046-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080812D842086012D845002070046-->  <DEPENDANT_MODULE_NAME><![CDATA[Workspace & Widgets]]></DEPENDANT_MODULE_NAME>
 <!--FF8080812D842086012D845002070046-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -6,7 +6,7 @@
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <NAME><![CDATA[Payment Report]]></NAME>
-<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.21974]]></VERSION>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.22139]]></VERSION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <DESCRIPTION><![CDATA[Payment Report]]></DESCRIPTION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <URL><![CDATA[http://forge.openbravo.com/projects/paymentreport]]></URL>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <TYPE><![CDATA[M]]></TYPE>
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -7,7 +7,7 @@
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_DEPENDENT_MODULE_ID>
-<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.21974]]></STARTVERSION>
+<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.22139]]></STARTVERSION>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <DEPENDANT_MODULE_NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></DEPENDANT_MODULE_NAME>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_PROCESS.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_PROCESS.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -20,6 +20,7 @@
 <!--6AD04479EC134BD4826077F36B709876-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--6AD04479EC134BD4826077F36B709876-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--6AD04479EC134BD4826077F36B709876-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--6AD04479EC134BD4826077F36B709876-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--6AD04479EC134BD4826077F36B709876--></AD_PROCESS>
 
 </data>
--- a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -12,7 +12,7 @@
 * under the License. 
 * The Original Code is Openbravo ERP. 
 * The Initial Developer of the Original Code is Openbravo SL 
-* All portions are Copyright (C) 2009-2012 Openbravo SL 
+* All portions are Copyright (C) 2009-2014 Openbravo SL 
 * All Rights Reserved. 
 * Contributor(s):  ______________________________________.
 ************************************************************************
@@ -131,22 +131,22 @@
   
   
   <structure name="structure1">
-    <FIELD id="fieldBPartner">BPARTNER</FIELD>
-    <FIELD id="fieldBPGroup">BP_GROUP</FIELD>
-    <FIELD id="fieldStatus">STATUS</FIELD>
-    <FIELD id="fieldProject">PROJECT</FIELD>
-    <FIELD id="fieldSalesPerson">SALES_PERSON</FIELD>
+    <FIELD id="fieldBPartner" replaceCharacters="html">BPARTNER</FIELD>
+    <FIELD id="fieldBPGroup" replaceCharacters="html">BP_GROUP</FIELD>
+    <FIELD id="fieldStatus" replaceCharacters="html">STATUS</FIELD>
+    <FIELD id="fieldProject" replaceCharacters="html">PROJECT</FIELD>
+    <FIELD id="fieldSalesPerson" replaceCharacters="html">SALES_PERSON</FIELD>
     
     <FIELD id="fieldInvLink" attribute="onclick" replace="zz">PAYMENT_PLAN_ID</FIELD>
     <FIELD id="fieldInvLink" attribute="onclick" replace="yy">ISRECEIPT</FIELD>
     <FIELD id="fieldInvLink" attribute="style" replace="xx">PAYMENT_PLAN_Y_N</FIELD>
-    <FIELD id="fieldInvoiceNumber">INVOICE_NUMBER</FIELD>
-    <FIELD id="fieldInvoiceNumber_nolink">INVOICE_NUMBER</FIELD>
+    <FIELD id="fieldInvoiceNumber" replaceCharacters="html">INVOICE_NUMBER</FIELD>
+    <FIELD id="fieldInvoiceNumber_nolink" replaceCharacters="html">INVOICE_NUMBER</FIELD>
     <FIELD id="fieldInvoiceNumber_nolink" attribute="style" replace="xx">NOT_PAYMENT_PLAN_Y_N</FIELD>
     
     <FIELD id="fieldInvoiceDate">INVOICE_DATE</FIELD>
     
-    <FIELD id="fieldPayment">PAYMENT</FIELD>
+    <FIELD id="fieldPayment" replaceCharacters="html">PAYMENT</FIELD>
     <FIELD id="fieldPaymLink" attribute="onclick" replace="zz">PAYMENT_ID</FIELD>
     <FIELD id="fieldPaymLink" attribute="onclick" replace="yy">ISRECEIPT</FIELD>
     <FIELD id="fieldPaymLink" attribute="style" replace="xx">PAYMENT_Y_N</FIELD>
@@ -160,8 +160,8 @@
     <FIELD id="fieldTransAmount" format="euroInform">TRANS_AMOUNT</FIELD>
     <FIELD id="fieldTransCurrency">TRANS_CURRENCY</FIELD>
     <FIELD id="fieldBaseAmount" format="euroInform">BASE_AMOUNT</FIELD>
-    <FIELD id="fieldBaseCurrency">BASE_CURRENCY</FIELD>
-    <FIELD id="fieldFinAccount">FINANCIAL_ACCOUNT</FIELD>
+    <FIELD id="fieldBaseCurrency" replaceCharacters="html">BASE_CURRENCY</FIELD>
+    <FIELD id="fieldFinAccount" replaceCharacters="html">FINANCIAL_ACCOUNT</FIELD>
 
 <!--     Accumulates Base Amount columns values -->
     <FUNCTION id="subtotalBaseAmount" name="SUM" format="euroInform">BASE_AMOUNT</FUNCTION>
@@ -171,17 +171,17 @@
   </structure>
   
   <structure name="structure2">
-    <FIELD id="fieldBPartner2">BPARTNER</FIELD>
-    <FIELD id="fieldBPGroup2">BP_GROUP</FIELD>
-    <FIELD id="fieldStatus2">STATUS</FIELD>
-    <FIELD id="fieldProject2">PROJECT</FIELD>
-    <FIELD id="fieldSalesPerson2">SALES_PERSON</FIELD>
+    <FIELD id="fieldBPartner2" replaceCharacters="html">BPARTNER</FIELD>
+    <FIELD id="fieldBPGroup2" replaceCharacters="html">BP_GROUP</FIELD>
+    <FIELD id="fieldStatus2" replaceCharacters="html">STATUS</FIELD>
+    <FIELD id="fieldProject2" replaceCharacters="html">PROJECT</FIELD>
+    <FIELD id="fieldSalesPerson2" replaceCharacters="html">SALES_PERSON</FIELD>
     
     <FIELD id="fieldInvLink2" attribute="onclick" replace="zz">PAYMENT_PLAN_ID</FIELD>
     <FIELD id="fieldInvLink2" attribute="onclick" replace="yy">ISRECEIPT</FIELD>
     <FIELD id="fieldInvLink2" attribute="style" replace="xx">PAYMENT_PLAN_Y_N</FIELD>
-    <FIELD id="fieldInvoiceNumber2">INVOICE_NUMBER</FIELD>
-    <FIELD id="fieldInvoiceNumber2_nolink">INVOICE_NUMBER</FIELD>
+    <FIELD id="fieldInvoiceNumber2" replaceCharacters="html">INVOICE_NUMBER</FIELD>
+    <FIELD id="fieldInvoiceNumber2_nolink" replaceCharacters="html">INVOICE_NUMBER</FIELD>
     <FIELD id="fieldInvoiceNumber2_nolink" attribute="style" replace="xx">NOT_PAYMENT_PLAN_Y_N</FIELD>
     
     <FIELD id="fieldInvoiceDate2">INVOICE_DATE</FIELD>
@@ -190,7 +190,7 @@
     <FIELD id="fieldPaymLink2" attribute="onclick" replace="yy">ISRECEIPT</FIELD>
     <FIELD id="fieldPaymLink2" attribute="style" replace="xx">PAYMENT_Y_N</FIELD>
     <FIELD id="fieldPaymLink2" attribute="title" replace="xx">PAYMENT_DESC</FIELD>
-    <FIELD id="fieldPayment2">PAYMENT</FIELD>
+    <FIELD id="fieldPayment2" replaceCharacters="html">PAYMENT</FIELD>
     
     <FIELD id="fieldDueDate2">DUE_DATE</FIELD>
     <FIELD id="fieldExpectedDate2">EXPECTED_DATE</FIELD>
@@ -200,10 +200,10 @@
     <FIELD id="fieldTransAmount2" format="euroInform">TRANS_AMOUNT</FIELD>
     <FIELD id="fieldTransCurrency2">TRANS_CURRENCY</FIELD>
     <FIELD id="fieldBaseAmount2" format="euroInform">BASE_AMOUNT</FIELD>
-    <FIELD id="fieldBaseCurrency2">BASE_CURRENCY</FIELD>
-    <FIELD id="fieldFinAccount2">FINANCIAL_ACCOUNT</FIELD>
-    <FIELD id="fieldGroupCritName">GROUP_CRIT_ID</FIELD>
-    <FIELD id="fieldGroupCrit">GROUP_CRIT_ID</FIELD>
+    <FIELD id="fieldBaseCurrency2" replaceCharacters="html">BASE_CURRENCY</FIELD>
+    <FIELD id="fieldFinAccount2" replaceCharacters="html">FINANCIAL_ACCOUNT</FIELD>
+    <FIELD id="fieldGroupCritName" replaceCharacters="html">GROUP_CRIT_ID</FIELD>
+    <FIELD id="fieldGroupCrit" replaceCharacters="html">GROUP_CRIT_ID</FIELD>
 
 <!--     Base Amount columns values -->
     <FUNCTION id="subtotalBaseAmountStatus" name="SUM" format="euroInform">BASE_AMOUNT</FUNCTION>
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -6,7 +6,7 @@
 <!--3A3A943684D64DEF9EC39F588A656848-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <NAME><![CDATA[Orders Awaiting Delivery]]></NAME>
-<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.21974]]></VERSION>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.22139]]></VERSION>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <DESCRIPTION><![CDATA[Report displaying sales orders not shipped.]]></DESCRIPTION>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <URL><![CDATA[http://forge.openbravo.com/projects/ordersawaitingdlivery]]></URL>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <TYPE><![CDATA[M]]></TYPE>
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -7,7 +7,7 @@
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <AD_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_MODULE_ID>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.21974]]></STARTVERSION>
+<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.22139]]></STARTVERSION>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_PROCESS.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_PROCESS.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -20,6 +20,7 @@
 <!--3DAA5E63A30D45A8ABF87701F8BD91EF-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--3DAA5E63A30D45A8ABF87701F8BD91EF-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--3DAA5E63A30D45A8ABF87701F8BD91EF-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--3DAA5E63A30D45A8ABF87701F8BD91EF-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--3DAA5E63A30D45A8ABF87701F8BD91EF--></AD_PROCESS>
 
 </data>
--- a/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -6,7 +6,7 @@
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <NAME><![CDATA[JSON Datasource]]></NAME>
-<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.21974]]></VERSION>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.22139]]></VERSION>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <DESCRIPTION><![CDATA[Provides data source CRUD functionality using JSON as the data format]]></DESCRIPTION>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <HELP><![CDATA[This module implements the datasource concept. Datasources play a central role in Smartclient applications. The datasource module automatically creates a datasource for each Openbravo entity. In addition custom data source implementations can be defined.]]></HELP>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <URL><![CDATA[http://forge.openbravo.com/projects/datasourceservice]]></URL>
--- a/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -7,7 +7,7 @@
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.21974]]></STARTVERSION>
+<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.22139]]></STARTVERSION>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <AD_DEPENDENT_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_DEPENDENT_MODULE_ID>
-<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.21974]]></STARTVERSION>
+<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.22139]]></STARTVERSION>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.21974]]></STARTVERSION>
+<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.22139]]></STARTVERSION>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--54AF8B39C55E4E7496902893ECD82786-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.21974]]></STARTVERSION>
+<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.22139]]></STARTVERSION>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.21974]]></STARTVERSION>
+<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.22139]]></STARTVERSION>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceProperty.java	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceProperty.java	Wed Feb 26 15:15:03 2014 +0100
@@ -42,7 +42,7 @@
 import org.openbravo.model.ad.domain.Reference;
 
 /**
- * A representation of the {@link DataSourceField} which can be read from the DataSourceField table
+ * A representation of the {@link DatasourceField} which can be read from the DataSourceField table
  * or created on the basis of an existing {@link Property} from the in-memory model.
  * 
  * DataSourceProperties are passed into the data source template to generate the data source
@@ -91,7 +91,7 @@
   }
 
   /**
-   * Create a DataSourceProperty using a {@link DataSourceField} to initialize it.
+   * Create a DataSourceProperty using a {@link DatasourceField} to initialize it.
    * 
    * @param dsField
    *          the data source field used to initialize the new data source property
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceService.java	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceService.java	Wed Feb 26 15:15:03 2014 +0100
@@ -58,9 +58,7 @@
   public List<DataSourceProperty> getDataSourceProperties(Map<String, Object> parameters);
 
   /**
-   * Execute a query request and return the result as a json string. For a query request the content
-   * ({@link #getPath()}) is normally empty, the query parameters can be found in the parameters map
-   * ({@link #getParameters()}).
+   * Execute a query request and return the result as a json string.
    * 
    * @param parameters
    *          the parameters often coming from the HTTP request
@@ -78,9 +76,7 @@
   public String remove(Map<String, String> parameters);
 
   /**
-   * Execute an insert action. There can be parameters in the parameter map (
-   * {@link #getParameters()}) but often the data to insert is present in the content (
-   * {@link #getPath()}).
+   * Execute an insert action.
    * 
    * @param parameters
    *          the parameters often coming from the HTTP request
@@ -91,9 +87,7 @@
   public String add(Map<String, String> parameters, String content);
 
   /**
-   * Execute an update action. There can be parameters in the parameter map (
-   * {@link #getParameters()}) but often the data to insert is present in the content (
-   * {@link #getPath()}).
+   * Execute an update action.
    * 
    * @param parameters
    *          the parameters often coming from the HTTP request
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -6,7 +6,7 @@
 <!--FF8080813129ADA401312CA1222A0005-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080813129ADA401312CA1222A0005-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813129ADA401312CA1222A0005-->  <NAME><![CDATA[Integration with Google APIs]]></NAME>
-<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.21974]]></VERSION>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.22139]]></VERSION>
 <!--FF8080813129ADA401312CA1222A0005-->  <DESCRIPTION><![CDATA[Integration with Google APIs]]></DESCRIPTION>
 <!--FF8080813129ADA401312CA1222A0005-->  <TYPE><![CDATA[M]]></TYPE>
 <!--FF8080813129ADA401312CA1222A0005-->  <LICENSE><![CDATA[Licensed under the Openbravo Public License Version 1.1.
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -7,7 +7,7 @@
 <!--FF8080813141B198013141BA0F7D0012-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141BA0F7D0012-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
 <!--FF8080813141B198013141BA0F7D0012-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.21974]]></STARTVERSION>
+<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.22139]]></STARTVERSION>
 <!--FF8080813141B198013141BA0F7D0012-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813141B198013141BA0F7D0012-->  <DEPENDANT_MODULE_NAME><![CDATA[OpenID Service Integration]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813141B198013141BA0F7D0012-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--FF8080813151AEE1013151C4ACE6001B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.21974]]></STARTVERSION>
+<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.22139]]></STARTVERSION>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -6,7 +6,7 @@
 <!--FF8080813141B198013141B86DD70003-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080813141B198013141B86DD70003-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141B86DD70003-->  <NAME><![CDATA[OpenID Service Integration]]></NAME>
-<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.21974]]></VERSION>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.22139]]></VERSION>
 <!--FF8080813141B198013141B86DD70003-->  <DESCRIPTION><![CDATA[OpenID Service Integration]]></DESCRIPTION>
 <!--FF8080813141B198013141B86DD70003-->  <TYPE><![CDATA[M]]></TYPE>
 <!--FF8080813141B198013141B86DD70003-->  <LICENSE><![CDATA[Licensed under the Openbravo Public License Version 1.1.
--- a/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -7,7 +7,7 @@
 <!--FF8080813141B198013141B8B21B0006-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141B8B21B0006-->  <AD_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_MODULE_ID>
 <!--FF8080813141B198013141B8B21B0006-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.21974]]></STARTVERSION>
+<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.22139]]></STARTVERSION>
 <!--FF8080813141B198013141B8B21B0006-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813141B198013141B8B21B0006-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813141B198013141B8B21B0006-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -6,7 +6,7 @@
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <NAME><![CDATA[JSON REST Webservice]]></NAME>
-<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.21974]]></VERSION>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.22139]]></VERSION>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <DESCRIPTION><![CDATA[Provides a JSON REST webservice for CRUD service requests]]></DESCRIPTION>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <HELP><![CDATA[Provides a JSON REST webservice for CRUD service requests. Both the servlet implementation (receiving HTTP REST requests in JSON) as the backend processing are provided.]]></HELP>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravojsonrest]]></URL>
--- a/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -7,7 +7,7 @@
 <!--9E3E7B42DB16405FB794496D309D7044-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <AD_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_MODULE_ID>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.21974]]></STARTVERSION>
+<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.22139]]></STARTVERSION>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java	Wed Feb 26 15:15:03 2014 +0100
@@ -116,7 +116,6 @@
         // explicitly
         boolean doCount = false;
         int count = -1;
-        int startRow = (startRowStr != null ? queryService.getFirstResult() : 0);
         int computedMaxResults = (queryService.getMaxResults() == null ? Integer.MAX_VALUE
             : queryService.getMaxResults());
         if (startRowStr != null) {
@@ -181,6 +180,9 @@
         }
 
         bobs = bobFetchTransformation(bobs, parameters);
+        // take start row from actual query service because it can be modified from the originally
+        // requested one
+        int startRow = queryService.getFirstResult() != null ? queryService.getFirstResult() : 0;
 
         if (preventCountOperation) {
           count = bobs.size() + startRow;
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonDataService.java	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonDataService.java	Wed Feb 26 15:15:03 2014 +0100
@@ -37,7 +37,7 @@
   /**
    * Do a query for {@link BaseOBObject} objects and return the result as a json string.
    * 
-   * One parameter is mandatory: {@link JsonConstants.ENTITYNAME}. The possible query parameters can
+   * One parameter is mandatory: {@link JsonConstants#ENTITYNAME}. The possible query parameters can
    * be found in {@link JsonConstants}, see the constants ending with _PARAMETER. All other request
    * parameters which correspond to properties of the queried objects are considered to be filter
    * properties.
@@ -49,15 +49,15 @@
    * 
    * @param parameters
    *          the parameters driving the query, one parameter is mandatory:
-   *          {@link JsonConstants.ENTITYNAME}
+   *          {@link JsonConstants#ENTITYNAME}
    * @return a json result string
    * @see QueryBuilder
    */
   public abstract String fetch(Map<String, String> parameters);
 
   /**
-   * Remove an object, this method expects two parameters: {@link JsonConstants.ID} and
-   * {@link JsonConstants.ENTITYNAME}. If they are not present an error is returned.
+   * Remove an object, this method expects two parameters: {@link JsonConstants#ID} and
+   * {@link JsonConstants#ENTITYNAME}. If they are not present an error is returned.
    * 
    * @param parameters
    *          two parameters should be present: id and entityName
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonToDataConverter.java	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonToDataConverter.java	Wed Feb 26 15:15:03 2014 +0100
@@ -616,8 +616,8 @@
 
   /**
    * Checks if the property is settable ({@link #isNotConvertable(BaseOBObject, Property)}. If so
-   * the jsonValue is converted ({@link #convertPrimitive(Property, Object)}, in case of a primive),
-   * or in case of a reference property the referenced object is read/created.
+   * the jsonValue is converted ({@link #convertJsonToPropertyValue(Property, Object)}, in case of a
+   * primitive), or in case of a reference property the referenced object is read/created.
    * 
    * @param obObject
    *          the object to set
@@ -753,7 +753,6 @@
    * @see Property#isAuditInfo()
    * @see Property#isClientOrOrganization()
    * @see Property#isOneToMany()
-   * @return
    */
   protected boolean isNotConvertable(BaseOBObject obObject, Property property) {
     // one-to-many are never json-ized
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -6,7 +6,7 @@
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <NAME><![CDATA[User Interface Selector]]></NAME>
-<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.21974]]></VERSION>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.22139]]></VERSION>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <DESCRIPTION><![CDATA[Provides a selector with a suggestion box and popup grid window]]></DESCRIPTION>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <HELP><![CDATA[The Openbravo selector provides new selector functionality which is used inside of existing Openbravo forms. The selector is mainly used for supporting foreign key references in the user interface. The selector combines both suggestion box behavior with a popup grid.]]></HELP>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <URL><![CDATA[http://forge.openbravo.com/projects/selector]]></URL>
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 25 10:11:55 2014 +1200
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 26 15:15:03 2014 +0100
@@ -7,7 +7,7 @@
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.21974]]></STARTVERSION>
+<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.22139]]></STARTVERSION>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID>
-<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.21974]]></STARTVERSION>
+<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.22139]]></STARTVERSION>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Application]]></DEPENDANT_MODULE_NAME>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.21974]]></STARTVERSION>
+<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.22139]]></STARTVERSION>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.21974]]></STARTVERSION>
+<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.22139]]></STARTVERSION>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--C8DAC574B88649D08C9468521B343F12-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--C8DAC574B88649D08C9468521B343F12-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--C8DAC574B88649D08C9468521B343F12-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.21974]]></STARTVERSION>
+<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.22139]]></STARTVERSION>
 <!--C8DAC574B88649D08C9468521B343F12-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--C8DAC574B88649D08C9468521B343F12-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--C8DAC574B88649D08C9468521B343F12-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -77,7 +77,7 @@
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC1