[Tree Extension] Merge with pi@22129
authorAugusto Mauch <augusto.mauch@openbravo.com>
Tue, 25 Feb 2014 16:21:31 +0100
changeset 22566 0bad5a351ad5
parent 22565 5cdf9e589bcc (current diff)
parent 22129 c6772c713f93 (diff)
child 22567 7205d9b08325
[Tree Extension] Merge with pi@22129
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TAB.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TABLE.xml
modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ApplicationDictionaryCachedStructures.java
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
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/grid/ob-view-grid.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js
src-db/database/model/tables/AD_TAB.xml
src-db/database/model/tables/AD_TABLE.xml
src-db/database/sourcedata/AD_AUXILIARINPUT.xml
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_ELEMENT.xml
src-db/database/sourcedata/AD_FIELD.xml
src-db/database/sourcedata/AD_MESSAGE.xml
src-db/database/sourcedata/AD_MODULE.xml
src-db/database/sourcedata/AD_REFERENCE.xml
src-db/database/sourcedata/AD_REF_LIST.xml
src-db/database/sourcedata/AD_TAB.xml
src-db/database/sourcedata/AD_TABLE.xml
src-db/database/sourcedata/AD_TREENODE.xml
src-db/database/sourcedata/AD_WINDOW.xml
src-db/database/sourcedata/OBUISEL_SELECTOR.xml
src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
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/GeneralAccountingReports.java
src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java
src/org/openbravo/erpCommon/utility/WindowTreeUtility.java
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 12:11:20 2014 +0100
+++ b/.hgsigs	Tue Feb 25 16:21:31 2014 +0100
@@ -123,3 +123,24 @@
 25c6c6b0acf9bc7dc91e39a5c7171d391354366f 0 iEYEABECAAYFAlIJt2EACgkQCX/oGf+2qkNshACg9Vi913GItU4PNXC2H0MqGKJnMQsAniAnZcbGlfjD0YbFourNSNs9rfl+
 03423edd830d99ac30c5938c915bd59b5805f39c 0 iEYEABECAAYFAlIXIXMACgkQCX/oGf+2qkOBnQCfVTDJFemSCCNyONytrElhgPzT7SEAnimrHqNU+GRUeeMHaY+/cVoYAwRD
 2cba8a4800b004a03d6bdc1863084421a17a496e 0 iEYEABECAAYFAlIoL7sACgkQCX/oGf+2qkPyTQCfVLRC/dJweMhAtUQUf0ysLeJuU1YAoMjPgLwhtEHs7DYZKMGkgrRKxfUP
+92028616e00a984620b7b5cb5185d5347a7d8e27 0 iEYEABECAAYFAlJWJuwACgkQCX/oGf+2qkOI6wCgpWwN1yrx+LccTz/Unl85E/iB1lkAoKkM5ffnfpaOxl+sSPqCwHfS7oDe
+1216d879483850c7a6ebd1b87b989bbdfebc7f38 0 iEYEABECAAYFAlJhLy0ACgkQCX/oGf+2qkPOzQCeKwXy9EQPSyYq/b5eALoFRQsHescAoL8RolWFBxkn+CGl4yR5gBgBp7mR
+b79dd1dc55aa66c08d26a88c004c167253307b9a 0 iEYEABECAAYFAlIyoXQACgkQCX/oGf+2qkPMWACg2suFjCYsdws4IU2H5S0wdXHkI+MAnjiRIQd2XaN/Yw6iAsj6jgI+y3Bx
+7b352c5386cbb6385d62d4ab3d41ccc1f24e51a5 0 iEYEABECAAYFAlJk27gACgkQCX/oGf+2qkO9egCfXPguGi2lAvNPrFV4Dw5pwtpmdOgAniLN/zfdCv2VlxUw/e5HC/kVOaKn
+f56c14fc0212d08ec0e9663d957dfdbf4ff42543 0 iEYEABECAAYFAlJbyIkACgkQCX/oGf+2qkOXiACgggW09+Z5WL1BrxaSVcZB0ykapr4AoKSn91Y1yvImj5/sEmdM5f37Y2RM
+ffdd47e41d59e56bf2f85033679accff7feaa941 0 iEYEABECAAYFAlJfscwACgkQCX/oGf+2qkOJFQCg/olIlg4QV8DcH3aJWB9NVlpgvG4An1P8ZPJjX7Rtaav0sb+N1DF9YaSh
+3dff4a5ade8aa7966fde9139428e968fb7f04218 0 iEYEABECAAYFAlJlPOMACgkQCX/oGf+2qkPsbgCg4w/JC1tFhyxz6mXa6UBOaEYz6esAnRCq24eVAcoNGrAfIfhXvKUBuQMQ
+8b9a63ffa8e5d52b063db22a52f747a3c616affc 0 iEYEABECAAYFAlKe/L8ACgkQCX/oGf+2qkMfuwCfafnQo9e1Wva5pycMnkB4/WDQgJoAoLJdXDJt51XxtNI5Orod5XJA+HMX
+bfe21782cd33b4c3bed1cd733f455de6dc61c766 0 iEYEABECAAYFAlKup5AACgkQCX/oGf+2qkNIUwCgmrPTAq/4glNIJPzOxIl9C5gw1pEAoN+hKrdK0v/e9SEVmKsNYlQx/NZr
+91ad366d9f86581478da0bb3d99d7ff3331cc122 0 iEYEABECAAYFAlK4JWQACgkQCX/oGf+2qkMErACg7Iyuv6yHr/cH6r73takBnxpIo68AoK9F6kNatgr1uLzcuYEJmvpTEa+f
+2630b57465e0c53e77eb0c08140ad461f8a6024f 0 iEYEABECAAYFAlKF+CoACgkQCX/oGf+2qkOn9wCeKuzyuNK/+6xev5U3u8tO6W0eT1YAmwbnnNrtFQRhq0Wd3jFWpbykW/vI
+f2a17a54900bff00269ae2ea9b904a32134de48f 0 iEYEABECAAYFAlKMuRsACgkQCX/oGf+2qkN1pwCeJzq8oiozQ5qgSNB6ZBboqjEwppEAniyBrwJie/OiwFTaP5VIxp+ceDSQ
+5c6aff00b4b918fe6b7691c5eaf8f2d3115663d5 0 iEYEABECAAYFAlK7rewACgkQCX/oGf+2qkMtywCgkLg5aCgESPTfOHWqCZHh/kHlJMMAn3ffErrTlhKq2qseSGElv/m5XKmx
+6cb91520bd6152b884793ccd31fca63cef7c24de 0 iEYEABECAAYFAlLONGgACgkQCX/oGf+2qkOROwCZAaFHuWQk90rhl9Uyk0+q+A/WSzkAn0bx0EJRwbi5quhYXT4G1/22W+LT
+1219ba4b103b5279bccdd4a15ed7f10413f3a071 0 iEYEABECAAYFAlLcp/8ACgkQCX/oGf+2qkNSSACg72n1A982Sggcbd0GwbY5jme/KbAAmwZ/KfImnFjo25Jqy+dctGaSvUxf
+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 12:11:20 2014 +0100
+++ b/.hgtags	Tue Feb 25 16:21:31 2014 +0100
@@ -134,3 +134,24 @@
 3ca2970a589227c6dfc3fbefe2650385ea7ddebc 3.0MP26
 28fa441122298d5cd7cabe28490ec7d6435e7809 3.0MP26.1
 1e51c66c0c395e41fc5384608dcd539a255c210d 3.0MP26.2
+f731bd4e0332d5976149e92aed53d49ed1852557 3.0MP26.3
+98e29b4482b8200f26d0409b025ee58a5ead5a05 3.0MP26.4
+5bc4ca20d6f5c30e0cb179912df555607df04577 3.0MP27
+eb7e3648c517b2b1e9d8c85eff550d43013ca922 3.0MP27.1
+db86a9cfecc308c3382feb357d53091f51ad3a4a 3.0MP28
+750dc95742e0d15c3ed8b484fa8dbc4aa689c627 3.0MP28.1
+0c73b69e61c55d8de0b3a0dfcc2e7511fa8a295f 3.0MP28.2
+72950e8d3e2a52a8c2c704f38f53977dcd46a297 3.0MP28.3
+0b0fda0f36cb25ffd9652b73d69d81f711275091 3.0MP28.4
+557cef358a018c6b4b42bb416a94a18b973773ae 3.0MP28.5
+cf86ae37f1bab9f9e401a6835258aabbdc91a705 3.0MP29
+f7af9706971ab040115da0a457c0034c53731ead 3.0MP29.1
+9e9a9563ededa4318d9d693fb473e57f2cbe0c7a 3.0MP29.2
+67c8fe865bb35eb8b2d8bbb7a7fe2944fc39ca47 3.0MP29.3
+cb850e15240717f68513d13fb2b07b27f9e14919 3.0MP29.4
+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 12:11:20 2014 +0100
+++ b/legal/Licensing.txt	Tue Feb 25 16:21:31 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)
--- a/lib/README	Tue Feb 25 12:11:20 2014 +0100
+++ b/lib/README	Tue Feb 25 16:21:31 2014 +0100
@@ -1,3 +1,4 @@
 When adding or removing libraries to Openbravo ERP please update this page
 with your changes:
 http://wiki.openbravo.com/wiki/Openbravo_Libraries
+
Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalance.class has changed
Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalanceData.class has changed
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/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml	Tue Feb 25 12:11:20 2014 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml	Tue Feb 25 16:21:31 2014 +0100
@@ -16,7 +16,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):  ______________________________________.
 ************************************************************************/
@@ -81,6 +81,8 @@
 v_finacct_currency VARCHAR2(32);
 v_rate NUMBER;
 v_PricePr NUMBER;
+v_isinvoicepaid CHAR(1):= 'N';
+v_IsCashVAT C_Invoice.IsCashVAT%TYPE;
 
 TYPE RECORD IS REF CURSOR;
 Cur_Params RECORD;
@@ -88,6 +90,8 @@
 cur_finaccpaymentmethod RECORD;
 cur_PaymentScheduleOrder RECORD;
 cur_linktopayment_scheddetails RECORD;
+cur_update_scheddetails RECORD;
+cur_invoicepaid RECORD;
 
 BEGIN
 
@@ -108,7 +112,6 @@
       p_result := cur_params.p_number;
     END IF;
   END LOOP;
-  
   -- Default user's language
   SELECT COALESCE(default_ad_language, 'en_US') INTO v_lang FROM ad_user where ad_user_id = p_user;
 
@@ -118,12 +121,14 @@
       grandtotal, C_PaymentTerm_ID, PaymentRule, C_Currency_ID,
       C_BPartner_ID, DateInvoiced, totallines, fin_paymentmethod_id,
       fin_payment_priority_id, documentNo, poreference,
-      c_project_id, c_campaign_id, c_activity_id, user1_id, user2_id, c_costcenter_id
+      c_project_id, c_campaign_id, c_activity_id, user1_id, user2_id, c_costcenter_id,
+      IsCashVAT
   INTO v_Client_ID, v_Org_ID, v_DocTypeTarget_ID, v_IsSOTrx,
       v_GrandTotal, v_PaymentTerm, v_PaymentRule, v_Currency_ID,
       v_BPartner_ID, v_DateInvoiced, v_totallines, v_PaymentMethod,
       v_PaymentPriority, v_documentno, v_poreference,
-      v_project_id, v_campaign_id, v_activity_id, v_user1, v_user2, v_costcenter
+      v_project_id, v_campaign_id, v_activity_id, v_user1, v_user2, v_costcenter,
+      v_IsCashVAT
   FROM c_invoice
   WHERE c_invoice_id=p_record_id;
   
@@ -133,27 +138,6 @@
 
   -- complete invoice
   IF (p_docaction = 'CO') THEN
-    -- Do not add payment for the reversal invoice if the voided invoice is not paid
-    SELECT COUNT(*)
-    INTO v_Count
-    FROM C_Invoice_Reverse
-    WHERE C_Invoice_ID = p_record_id;
-
-    IF(v_Count <> 0) THEN
-	SELECT COALESCE(ispaid, 'Y')
-	INTO v_InvoicePaid
-	FROM C_Invoice
-	WHERE C_Invoice_ID IN (
-		SELECT Reversed_C_Invoice_ID
-		FROM C_Invoice_Reverse
-		WHERE C_Invoice_Id = p_record_id
-	);
-
-	IF (v_InvoicePaid = 'N') THEN
-		RETURN;
-	END IF;
-    END IF;
-    	
     -- Checking Payment Method ID is available
     IF(v_PaymentMethod IS NULL) THEN
       RAISE_APPLICATION_ERROR(-20000, '@APRM_PAYMENTMETHOD_MISSING@');
@@ -188,7 +172,8 @@
       END;
     END IF;
     -- END Extension Point
-
+    
+    
     DECLARE
       cur_payments RECORD;
       cur_order_schdet_ISOPEN BOOLEAN:=false;
@@ -214,13 +199,15 @@
       v_paymentCount NUMBER:= 0;
       v_negativePS NUMBER:= 1;
       v_psdbreakbypartialpayment BOOLEAN:=TRUE;
+      cur_cinvoicetax RECORD;
+      v_PercentageCashVAT NUMBER;
 
       CURSOR cur_order_schdet (invoice_id VARCHAR) IS
       SELECT DISTINCT c_orderline.c_order_id AS order_id, fin_payment_scheduledetail.amount + COALESCE(fin_payment_scheduledetail.writeoffamt,0) AS amount,
              fin_payment_scheduledetail_id,
              fin_payment_scheduledetail.fin_payment_schedule_order,
              fin_payment_scheduledetail.fin_payment_detail_id,
-             CASE WHEN fin_payment.status IN ('PPM', 'RPR', 'PWNC', 'RDNC', 'RPPC') THEN 'Y' ELSE 'N' END AS paid,
+             fin_payment_scheduledetail.isinvoicepaid AS paid,
              CASE WHEN fin_payment_scheduledetail.fin_payment_detail_id is not null THEN 0 ELSE 1 END AS priority
       FROM c_invoiceline, c_orderline, fin_payment_schedule,
         fin_payment_scheduledetail LEFT JOIN fin_payment_detail ON fin_payment_scheduledetail.fin_payment_detail_id = fin_payment_detail.fin_payment_detail_id
@@ -259,7 +246,7 @@
             
       --Insert Payment Schedules for Invoices
       v_pendingAmount := v_GrandTotal - coalesce(v_ConsumedGranTotal, 0);
-      
+
       IF (v_pendingAmount <> 0) THEN
 
         --get number of payment schedules expected for the invoice
@@ -370,7 +357,7 @@
               v_scheduledetailamount := v_differenceamount;
               v_scheduledetailid := v_new_scheduledetailid;
             END IF;
-
+            
             IF (order_schdet.order_id <> v_oldorder) THEN
               -- get invoiced amount for the order
               SELECT COALESCE(SUM(c_invoiceline.linenetamt+c_getinvoiceline_taxamount(c_invoiceline.c_invoiceline_id)),0) INTO v_invoicedamount
@@ -450,6 +437,7 @@
 
               --When difference amount is not 0 the payment schedule detail of the order has to be split. The difference
               --amount is the amount of the new psd that is not related to any invoice.
+
               IF (v_differenceamount > 0) THEN
                 v_new_scheduledetailid := get_uuid();
                 INSERT INTO fin_payment_scheduledetail
@@ -493,8 +481,25 @@
                   updatedby = p_user
               WHERE fin_payment_scheduledetail_id = v_scheduledetailid;
 
+               UPDATE FIN_PAYMENT_SCHEDULEDETAIL
+              SET isinvoicepaid=(select CASE WHEN fpsd.fin_payment_detail_id is null then 'N'
+                  WHEN ((aprm_seqnumberpaymentstatus(fp.status))>= (aprm_seqnumberpaymentstatus((CASE WHEN fp.isreceipt='Y' 
+                  THEN Payin_Invoicepaidstatus ELSE Payout_Invoicepaidstatus END)))) THEN 'Y' ELSE 'N' END
+                  from fin_payment_scheduledetail fpsd
+                  left join fin_payment_detail fpd on fpsd.fin_payment_detail_id=fpd.fin_payment_detail_id
+                  left join fin_payment fp on fpd.fin_payment_id=fp.fin_payment_id
+                  left join fin_financial_account fa on fa.fin_financial_account_id=fp.fin_financial_account_id 
+                  left join FIN_FinAcc_PaymentMethod fpm on fpm.fin_financial_account_id=fp.fin_financial_account_id 
+                 and fpm.fin_paymentmethod_id=fp.fin_paymentmethod_id WHERE fin_payment_scheduledetail_id = v_scheduledetailid) 
+                 WHERE FIN_PAYMENT_SCHEDULEDETAIL_ID = v_scheduledetailid;
+              
               -- if paid, update paid and outstanding amount
-              IF (order_schdet.paid = 'Y') THEN
+              select isinvoicepaid 
+              into v_isinvoicepaid 
+              from fin_payment_scheduledetail
+              where fin_payment_scheduledetail_id = v_scheduledetailid;
+              
+              IF (v_isinvoicepaid = 'Y') THEN
                 UPDATE fin_payment_schedule
                 SET outstandingamt = outstandingamt - COALESCE(v_scheduledetailamount,0),
                     paidamt = paidamt + COALESCE(v_scheduledetailamount, 0)
@@ -503,6 +508,26 @@
 
               v_scheduledamount := v_scheduledamount - v_scheduledetailamount;
 
+	      -- Create C_InvoiceTax_CashVAT records
+	      IF (v_IsCashVAT = 'Y' AND order_schdet.fin_payment_detail_id IS NOT NULL) THEN
+                v_PercentageCashVAT := abs(c_currency_round(v_scheduledetailamount * 100 / v_GrandTotal, v_Currency_ID, null));
+		FOR cur_cinvoicetax IN (
+		  SELECT it.C_InvoiceTax_ID, it.taxamt, it.taxbaseamt
+                  FROM C_InvoiceTax it INNER JOIN C_Tax t on (it.c_tax_id = t.c_tax_id)
+		  WHERE it.c_invoice_id = p_record_id
+                  AND t.isCashVAT = 'Y'
+                )
+                LOOP
+	          INSERT INTO c_invoicetax_cashvat(
+                  c_invoicetax_cashvat_id, ad_client_id, ad_org_id, isactive, created,
+                  createdby, updated, updatedby, c_invoicetax_id, percentage, taxamt,
+                  taxbaseamt, fin_payment_detail_id)
+                  VALUES (get_uuid(), v_Client_ID, v_Org_ID, 'Y', now(),
+                  p_user, now(), p_user, cur_cinvoicetax.C_InvoiceTax_ID, v_PercentageCashVAT, c_currency_round(v_PercentageCashVAT * cur_cinvoicetax.taxamt / 100, v_Currency_ID, null),
+                  c_currency_round(v_PercentageCashVAT * cur_cinvoicetax.taxbaseamt / 100, v_Currency_ID, null), order_schdet.fin_payment_detail_id);
+                END LOOP;
+	      END IF;
+
               IF (v_scheduledamount * v_negativeps <= 0 AND v_paymentcount > 0) THEN
                 -- actual invoice's payment schedule processed.
                 v_oldorder := order_schdet.order_id;
@@ -539,7 +564,7 @@
         CLOSE cur_order_schdet;
       
       END IF;
-
+             
       -- Reading Data from FIN_PAYMENT_SCHEDULE
       SELECT COALESCE(sum(PAIDAMT),0) as PaidAmount, COALESCE(SUM(OUTSTANDINGAMT),0) as OutstandingAmount
         INTO v_PaidAmount,V_OutstandingAmount
@@ -626,6 +651,27 @@
           LOOP
             -- Automatic creation of payment
             IF(cur_finaccpaymentmethod.CreatePayment = 'Y') THEN
+
+              -- Do not add payment for the reversal invoice if the actual invoice is not paid
+	      SELECT COUNT(*)
+	      INTO v_Count
+	      FROM C_Invoice_Reverse
+	      WHERE C_Invoice_ID = p_record_id;
+
+	      IF(v_Count <> 0) THEN
+		SELECT COALESCE(ispaid, 'Y')
+		INTO v_InvoicePaid
+		FROM C_Invoice
+		WHERE C_Invoice_ID IN (
+			SELECT Reversed_C_Invoice_ID
+			FROM C_Invoice_Reverse
+			WHERE C_Invoice_Id = p_record_id
+		);
+		IF (v_InvoicePaid = 'N') THEN
+		  RETURN;
+		END IF;
+	      END IF;
+
               v_ResultStr:='Generating FIN_PAYMENT';
               v_FIN_PAYMENT_ID := GET_UUID();
               v_PaymentDocType_ID := AD_GET_DOCTYPE(v_client_id, cur_paymentschedule.AD_ORG_ID, CASE WHEN v_IsSOTrx='Y' THEN 'ARR' ELSE 'APP' END);
@@ -700,8 +746,9 @@
                 'N', 'N', 'N', v_finpayment_desc,
                 v_Financial_Account_ID, v_PaymentDocType_ID, v_project_id, v_campaign_id, v_costcenter,
                 v_activity_id, v_user1, v_user2, 'N', 'N', 'N');
+
+              v_description_first := TRUE;
               
-              v_description_first := TRUE;
               -- link to the new payment all the pending payment schedule details
               FOR cur_linktopayment_scheddetails IN (
                    SELECT FIN_PAYMENT_SCHEDULEDETAIL_ID, AMOUNT
@@ -723,6 +770,27 @@
                 SET FIN_PAYMENT_DETAIL_ID = v_FIN_PAYMENT_DETAIL_ID
                 WHERE FIN_PAYMENT_SCHEDULEDETAIL_ID = cur_linktopayment_scheddetails.FIN_PAYMENT_SCHEDULEDETAIL_ID
                   AND FIN_PAYMENT_DETAIL_ID IS NULL;
+                  
+                -- Create C_InvoiceTax_CashVAT records
+	      IF (v_IsCashVAT = 'Y') THEN
+                v_PercentageCashVAT := abs(c_currency_round(cur_linktopayment_scheddetails.AMOUNT * 100 / v_GrandTotal, v_Currency_ID, null));
+                FOR cur_cinvoicetax IN (
+                  SELECT it.C_InvoiceTax_ID, it.taxamt, it.taxbaseamt
+                  FROM C_InvoiceTax it INNER JOIN C_Tax t on (it.c_tax_id = t.c_tax_id)
+                  WHERE it.c_invoice_id = p_record_id
+                  AND t.isCashVAT='Y'
+                )
+                LOOP
+                  INSERT INTO c_invoicetax_cashvat(
+                        c_invoicetax_cashvat_id, ad_client_id, ad_org_id, isactive, created,
+                        createdby, updated, updatedby, c_invoicetax_id, percentage, taxamt,
+                        taxbaseamt, fin_payment_detail_id)
+                        VALUES (get_uuid(), v_Client_ID, v_Org_ID, 'Y', now(),
+                        p_user, now(), p_user, cur_cinvoicetax.C_InvoiceTax_ID, v_PercentageCashVAT, c_currency_round(v_PercentageCashVAT * cur_cinvoicetax.taxamt / 100, v_Currency_ID, null),
+                        c_currency_round(v_PercentageCashVAT * cur_cinvoicetax.taxbaseamt / 100, v_Currency_ID, null), v_FIN_PAYMENT_DETAIL_ID);
+                END LOOP;
+	      END IF;
+        
               END LOOP;
 
               --Fixes 14403 defect 
@@ -746,6 +814,27 @@
                   EM_APRM_PROCESS_PAYMENT = 'R'
               WHERE FIN_PAYMENT_ID = v_FIN_PAYMENT_ID;
 
+                           FOR cur_update_scheddetails IN (
+                SELECT fin_payment_scheduledetail_id
+                FROM fin_payment_schedule ps
+                INNER JOIN fin_payment_scheduledetail psd 
+                ON ps.fin_payment_schedule_id = psd.fin_payment_schedule_invoice                                                    
+                WHERE ps.c_invoice_id =p_record_id
+              )
+              LOOP
+              UPDATE FIN_PAYMENT_SCHEDULEDETAIL
+              SET isinvoicepaid=(select CASE WHEN fpsd.fin_payment_detail_id is null then 'N'
+                  WHEN ((aprm_seqnumberpaymentstatus(fp.status))>= (aprm_seqnumberpaymentstatus((CASE WHEN fp.isreceipt='Y' 
+                  THEN Payin_Invoicepaidstatus ELSE Payout_Invoicepaidstatus END)))) THEN 'Y' ELSE 'N' END
+                  from fin_payment_scheduledetail fpsd
+                  left join fin_payment_detail fpd on fpsd.fin_payment_detail_id=fpd.fin_payment_detail_id
+                  left join fin_payment fp on fpd.fin_payment_id=fp.fin_payment_id
+                  left join fin_financial_account fa on fa.fin_financial_account_id=fp.fin_financial_account_id 
+                  left join FIN_FinAcc_PaymentMethod fpm on fpm.fin_financial_account_id=fp.fin_financial_account_id 
+                 and fpm.fin_paymentmethod_id=fp.fin_paymentmethod_id WHERE fin_payment_scheduledetail_id = cur_update_scheddetails.fin_payment_scheduledetail_id) 
+                 WHERE FIN_PAYMENT_SCHEDULEDETAIL_ID = cur_update_scheddetails.fin_payment_scheduledetail_id;
+              END LOOP;
+
               -- Update payment schedule amounts and payment monitor in case that the payment is not left in awaiting
               -- execution status.
               FOR cur_PaymentScheduleOrder IN (
@@ -768,7 +857,8 @@
                     v_finpayment_desc:=v_finpayment_desc || ', ' || v_orderno;
                   END IF;
                 END IF;
-                IF (cur_finaccpaymentmethod.ExecutionType<>'A') THEN
+                
+                  IF (cur_finaccpaymentmethod.ExecutionType<>'A') THEN
                   UPDATE FIN_PAYMENT_SCHEDULE
                   SET PAIDAMT = (SELECT COALESCE(sum(amount + COALESCE(writeoffamt, 0)), 0)
                                  FROM fin_payment_scheduledetail
@@ -777,7 +867,8 @@
                                        exists (SELECT 1
                                                FROM fin_payment, fin_payment_detail
                                                WHERE fin_payment.fin_payment_id = fin_payment_detail.fin_payment_id
-                                                      and fin_payment.processed='Y' and fin_payment.status<>'RPAE'
+                                                      and fin_payment.processed='Y' 
+                                                      and fin_payment_scheduledetail.isinvoicepaid='Y'
                                                       and fin_payment_detail.fin_payment_detail_id = fin_payment_scheduledetail.fin_payment_detail_id)),
                       OUTSTANDINGAMT = (SELECT COALESCE(sum(amount), 0)
                                         FROM fin_payment_scheduledetail
@@ -786,8 +877,10 @@
                                        exists (SELECT 1
                                                FROM fin_payment, fin_payment_detail
                                                WHERE fin_payment.fin_payment_id = fin_payment_detail.fin_payment_id
-                                                      and fin_payment.processed='Y' and fin_payment.status = 'RPAE'
+                                                      and fin_payment.processed='Y' 
+                                                      and fin_payment_scheduledetail.isinvoicepaid='Y'
                                                       and fin_payment_detail.fin_payment_detail_id = fin_payment_scheduledetail.fin_payment_detail_id)))
+
                   WHERE FIN_PAYMENT_SCHEDULE_ID = cur_PaymentScheduleOrder.FIN_PAYMENT_SCHEDULE_ORDER;
                 END IF;
               END LOOP;
@@ -796,7 +889,17 @@
               END IF;
               UPDATE FIN_PAYMENT SET DESCRIPTION = v_finpayment_desc
                 WHERE FIN_PAYMENT_ID = v_FIN_PAYMENT_ID;
-              IF (cur_finaccpaymentmethod.ExecutionType<>'A') THEN  
+
+              FOR cur_invoicepaid IN (
+                select isinvoicepaid from fin_payment_scheduledetail fpsd
+               left join fin_payment_detail fpd on fpsd.fin_payment_detail_id=fpd.fin_payment_detail_id
+               left join fin_payment fp on fpd.fin_payment_id=fp.fin_payment_id
+               left join fin_payment_schedule ps ON ps.fin_payment_schedule_id = fpsd.fin_payment_schedule_invoice
+                 WHERE ps.c_invoice_id =p_record_id
+              )
+             LOOP
+
+              IF ((cur_finaccpaymentmethod.ExecutionType<>'A') AND (cur_invoicepaid.isinvoicepaid='Y')) THEN 
                 UPDATE FIN_PAYMENT_SCHEDULE
                 SET PAIDAMT = PAIDAMT + COALESCE(cur_paymentschedule.OUTSTANDINGAMT,0),
                     OUTSTANDINGAMT = OUTSTANDINGAMT - COALESCE(cur_paymentschedule.OUTSTANDINGAMT, 0)
@@ -824,7 +927,7 @@
                 SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) - (COALESCE(cur_paymentschedule.OUTSTANDINGAMT, 0) * v_creditmultiplier)
                 WHERE C_BPARTNER_ID = v_BPartner_ID;
               END IF;
-
+            END LOOP;
               -- Automatic creation of financial transaction
               IF(cur_finaccpaymentmethod.CreateFinTransaction = 'Y' AND cur_finaccpaymentmethod.ExecutionType = 'M') THEN
                 v_ResultStr:='Generating FIN_FINACC_TRANSACTION';
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml	Tue Feb 25 12:11:20 2014 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml	Tue Feb 25 16:21:31 2014 +0100
@@ -182,6 +182,8 @@
     -- check there is not any paid payment
     DECLARE
       Cur_PaymentScheduleDetail RECORD;
+      v_FinPaymentScheduleDetailId VARCHAR2(32);
+      v_payment_schedule_invoice VARCHAR2(32);
     BEGIN
       SELECT count(*) INTO v_count
       FROM fin_payment_schedule
@@ -198,6 +200,10 @@
           AND ps.c_order_id = p_record_id
         ) LOOP
         IF (cur_paymentscheduledetail.fin_payment_schedule_invoice IS NOT NULL) THEN
+          IF cur_paymentscheduledetail.fin_payment_schedule_order IS NOT NULL THEN
+            v_FinPaymentScheduleDetailId:=cur_paymentscheduledetail.fin_payment_scheduledetail_id;
+            v_payment_schedule_invoice:=cur_paymentscheduledetail.fin_payment_schedule_invoice;
+          END IF;
           UPDATE fin_payment_scheduledetail
           SET fin_payment_schedule_order = null
           WHERE fin_payment_scheduledetail_id = cur_paymentscheduledetail.fin_payment_scheduledetail_id;
@@ -210,6 +216,21 @@
       v_resultstr:='Delete scheduled payments';
       DELETE FROM fin_payment_schedule
       WHERE c_order_id = p_record_id;
+
+      -- When there are more than one payment schedule for the invoice related to the order, merge the payment schedules
+      IF v_FinPaymentScheduleDetailId IS NOT NULL THEN
+        UPDATE fin_payment_scheduledetail
+        SET amount = (SELECT SUM(amount)
+			FROM fin_payment_scheduledetail
+			WHERE fin_payment_schedule_invoice = v_payment_schedule_invoice
+			AND fin_payment_schedule_order IS NULL)
+        WHERE fin_payment_scheduledetail_id = v_FinPaymentScheduleDetailId;
+
+        DELETE FROM fin_payment_scheduledetail
+        WHERE fin_payment_scheduledetail_id <> v_FinPaymentScheduleDetailId
+        AND fin_payment_schedule_invoice = v_payment_schedule_invoice
+        AND fin_payment_schedule_order IS NULL;
+      END IF;
     END;
   ELSIF (p_docaction = 'CL') THEN
     DECLARE
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml	Tue Feb 25 12:11:20 2014 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml	Tue Feb 25 16:21:31 2014 +0100
@@ -19,7 +19,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):  ______________________________________.
 ************************************************************************/
@@ -28,30 +28,46 @@
   v_module   VARCHAR2(32);
   v_dbprefix   VARCHAR2(7);
   v_isPaymentConfirmed CHAR(1) := 'N';
+  v_isinvoicepaid CHAR(1):= 'N';
+  v_referencelist VARCHAR2(32):='575BCB88A4694C27BC013DE9C73E6FE7';
   TYPE RECORD IS REF CURSOR;
   Cur_Dbprefix RECORD;
-
+  v_invoicepaidstatus  VARCHAR2(32);
 BEGIN
   -- Check if the status exists
   SELECT count(*) INTO v_count FROM DUAL
   WHERE EXISTS (SELECT 1 FROM ad_ref_list
-                WHERE ad_reference_id = '575BCB88A4694C27BC013DE9C73E6FE7'
+                WHERE ad_reference_id = v_referencelist
                       AND value = status);
 
   IF (v_count = 0) THEN
     RETURN 'N';
   END IF;
-  IF (status IN ('PPM', 'RPR', 'PWNC', 'RDNC', 'RPPC')) THEN
-    -- core final statuses
-    v_isPaymentConfirmed := 'Y';
-  ELSIF (status IN ('RPAP', 'RPAE', 'RPVOID')) THEN
-    -- core intermediate statuses
-    v_isPaymentConfirmed := 'N';
-  ELSE
+  select isinvoicepaid 
+  into v_isinvoicepaid
+  from fin_payment_scheduledetail 
+  where fin_payment_scheduledetail_id=fin_payment_scheduledetail_id;
+  
+  IF ((fin_payment_scheduledetail_id <> '') AND (fin_payment_scheduledetail_id is not null))THEN
+    IF(v_isinvoicepaid='Y')THEN
+     -- core intermediate statuses
+      v_isPaymentConfirmed := 'Y';
+    ELSE
+     -- core intermediate statuses
+      v_isPaymentConfirmed := 'N';
+    END IF;
+  ELSE 
+    IF(status IN ('PPM', 'RPR', 'PWNC', 'RDNC', 'RPPC'))THEN
+     -- core intermediate statuses
+      v_isPaymentConfirmed := 'Y';
+    ELSIF (status IN ('RPAP', 'RPAE', 'RPVOID')) THEN
+     -- core intermediate statuses
+      v_isPaymentConfirmed := 'N'; 
+    ELSE
     -- statuses implemented by other module
     SELECT ad_module_id INTO v_module
     FROM ad_ref_list
-    WHERE ad_reference_id = '575BCB88A4694C27BC013DE9C73E6FE7'
+    WHERE ad_reference_id = v_referencelist
       AND value = status;
 
     -- if the module defines a merge can have several dbprefix
@@ -74,7 +90,7 @@
       END;
     END LOOP;
   END IF;
-
+  END IF;
   RETURN v_isPaymentConfirmed;
 
 EXCEPTION
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml	Tue Feb 25 16:21:31 2014 +0100
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+  <database name="FUNCTION APRM_SEQNUMBERPAYMENTSTATUS">
+    <function name="APRM_SEQNUMBERPAYMENTSTATUS" type="VARCHAR">
+      <parameter name="status" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <body><![CDATA[/*************************************************************************
+* The contents of this file are subject to the Openbravo  Public  License
+* Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+* Version 1.1  with a permitted attribution clause; you may not  use this
+* file except in compliance with the License. You  may  obtain  a copy of
+* the License at http://www.openbravo.com/legal/license.html
+* Software distributed under the License  is  distributed  on  an "AS IS"
+* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+* License for the specific  language  governing  rights  and  limitations
+* under the License.
+* The Original Code is Openbravo ERP.
+* The Initial Developer of the Original Code is Openbravo SLU
+* All portions are Copyright (C) 2014 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+************************************************************************/
+  v_seqno VARCHAR2(32);
+  v_count NUMBER;
+  v_referencelist VARCHAR2(32):='575BCB88A4694C27BC013DE9C73E6FE7';
+
+BEGIN
+  -- Check if the status exists
+  SELECT count(*) INTO v_count FROM DUAL
+  WHERE EXISTS (SELECT 1 FROM ad_ref_list
+                WHERE ad_reference_id = v_referencelist
+                      AND value = status);
+
+  IF (v_count = 0) THEN
+    RETURN 'N';
+  END IF;
+  
+  SELECT seqno 
+  INTO v_seqno
+  FROM ad_ref_list
+  WHERE ad_reference_id = v_referencelist
+  and value = status;
+
+  RETURN v_seqno;
+
+EXCEPTION
+WHEN OTHERS THEN
+  DBMS_OUTPUT.PUT_LINE('aprm_seqnumberpaymentstatus exception');
+  RAISE;
+END APRM_SEQNUMBERPAYMENTSTATUS
+]]></body>
+    </function>
+  </database>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_FINACC_TRAN_CHECK_TRG.xml	Tue Feb 25 12:11:20 2014 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_FINACC_TRAN_CHECK_TRG.xml	Tue Feb 25 16:21:31 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/model/views/APRM_FINACC_TRANSACTION_ACCT_V.xml	Tue Feb 25 12:11:20 2014 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/views/APRM_FINACC_TRANSACTION_ACCT_V.xml	Tue Feb 25 16:21:31 2014 +0100
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
   <database name="VIEW APRM_FINACC_TRANSACTION_ACCT_V">
-    <view name="APRM_FINACC_TRANSACTION_ACCT_V"><![CDATA[SELECT fact_acct.fact_acct_id AS fin_finacc_transaction_acct_id, fact_acct.ad_client_id, fact_acct.ad_org_id, fact_acct.isactive, fact_acct.created, fact_acct.createdby, fact_acct.updated, fact_acct.updatedby, fact_acct.c_acctschema_id, fact_acct.account_id AS c_elementvalue_id, fact_acct.datetrx, fact_acct.dateacct, fact_acct.c_period_id, fact_acct.ad_table_id, fact_acct.record_id AS fin_finacc_transaction_id, fin_finacc_transaction.fin_financial_account_id, fact_acct.gl_category_id, fact_acct.c_tax_id, fact_acct.m_locator_id, fact_acct.postingtype, fact_acct.c_currency_id, fact_acct.amtsourcedr, fact_acct.amtsourcecr, fact_acct.amtacctdr, fact_acct.amtacctcr, fact_acct.c_uom_id, fact_acct.qty, fact_acct.m_product_id, fact_acct.c_bpartner_id, fact_acct.ad_orgtrx_id, fact_acct.c_locfrom_id, fact_acct.c_locto_id, fact_acct.c_salesregion_id, fact_acct.c_project_id, fact_acct.c_campaign_id, fact_acct.c_activity_id, fact_acct.user1_id, fact_acct.user2_id, fact_acct.description, fact_acct.a_asset_id, fact_acct.fact_acct_group_id, fact_acct.seqno, fact_acct.factaccttype, fact_acct.docbasetype, fact_acct.acctvalue, fact_acct.acctdescription, fact_acct.c_withholding_id, fin_finacc_transaction.fin_finacc_transaction_id AS aprm_finacc_transaction_v_id FROM fact_acct, fin_finacc_transaction WHERE fact_acct.record_id = fin_finacc_transaction.fin_finacc_transaction_id AND fact_acct.ad_table_id = '4D8C3B3C31D1410DA046140C9F024D17']]></view>
+    <view name="APRM_FINACC_TRANSACTION_ACCT_V"><![CDATA[SELECT fact_acct.fact_acct_id AS fin_finacc_transaction_acct_id, fact_acct.ad_client_id, fact_acct.ad_org_id, fact_acct.isactive, fact_acct.created, fact_acct.createdby, fact_acct.updated, fact_acct.updatedby, fact_acct.c_acctschema_id, fact_acct.account_id AS c_elementvalue_id, fact_acct.datetrx, fact_acct.dateacct, fact_acct.c_period_id, fact_acct.ad_table_id, fact_acct.record_id AS fin_finacc_transaction_id, fin_finacc_transaction.fin_financial_account_id, fact_acct.gl_category_id, fact_acct.c_tax_id, fact_acct.m_locator_id, fact_acct.postingtype, fact_acct.c_currency_id, fact_acct.amtsourcedr, fact_acct.amtsourcecr, fact_acct.amtacctdr, fact_acct.amtacctcr, fact_acct.c_uom_id, fact_acct.qty, fact_acct.m_product_id, fact_acct.c_bpartner_id, fact_acct.ad_orgtrx_id, fact_acct.c_locfrom_id, fact_acct.c_locto_id, fact_acct.c_salesregion_id, fact_acct.c_project_id, fact_acct.c_campaign_id, fact_acct.c_activity_id, fact_acct.user1_id, fact_acct.user2_id, fact_acct.description, fact_acct.a_asset_id, fact_acct.fact_acct_group_id, fact_acct.seqno, fact_acct.factaccttype, fact_acct.docbasetype, fact_acct.acctvalue, fact_acct.acctdescription, fact_acct.c_withholding_id, fin_finacc_transaction.fin_finacc_transaction_id AS aprm_finacc_transaction_v_id, fact_acct.c_costcenter_id FROM fact_acct, fin_finacc_transaction WHERE fact_acct.record_id = fin_finacc_transaction.fin_finacc_transaction_id AND fact_acct.ad_table_id = '4D8C3B3C31D1410DA046140C9F024D17']]></view>
   </database>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/views/APRM_RECONCILIATION_V.xml	Tue Feb 25 12:11:20 2014 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/views/APRM_RECONCILIATION_V.xml	Tue Feb 25 16:21:31 2014 +0100
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
   <database name="VIEW APRM_RECONCILIATION_V">
-    <view name="APRM_RECONCILIATION_V"><![CDATA[SELECT fin_reconciliation.fin_reconciliation_id AS aprm_reconciliation_v_id, fin_reconciliation.fin_reconciliation_id, fin_reconciliation.ad_client_id, fin_reconciliation.ad_org_id, fin_reconciliation.created, fin_reconciliation.createdby, fin_reconciliation.updated, fin_reconciliation.updatedby, fin_reconciliation.isactive, fin_reconciliation.fin_financial_account_id, fin_reconciliation.documentno, fin_reconciliation.c_doctype_id, fin_reconciliation.dateto, fin_reconciliation.statementdate, fin_reconciliation.endingbalance, fin_reconciliation.startingbalance, fin_reconciliation.docstatus, fin_reconciliation.processing, fin_reconciliation.processed, fin_reconciliation.posted, fin_reconciliation.printdetailed, fin_reconciliation.em_aprm_process_reconciliation AS process_reconciliation, fin_reconciliation.printsummary, COALESCE(item.item_no, 0) AS item_no, COALESCE(item.item_amt, 0) AS item_amt, COALESCE(unrec.unrec_no, 0) AS unrec_no, COALESCE(unrec.unrec_amt, 0) AS unrec_amt, COALESCE(outstanding.payment_no, 0) AS payment_no, COALESCE(outstanding.payment_amt, 0) AS payment_amt, COALESCE(outstanding.deposit_no, 0) AS deposit_no, COALESCE(outstanding.deposit_amt, 0) AS deposit_amt, (SELECT ad_table.ad_table_id FROM ad_table WHERE lower(ad_table.tablename) = 'fin_reconciliation') AS forced_table_id FROM fin_reconciliation LEFT JOIN (SELECT fin_finacc_transaction.fin_reconciliation_id, count(*) AS item_no, COALESCE(sum(fin_finacc_transaction.depositamt - fin_finacc_transaction.paymentamt), 0) AS item_amt FROM fin_finacc_transaction GROUP BY fin_finacc_transaction.fin_reconciliation_id) item ON fin_reconciliation.fin_reconciliation_id = item.fin_reconciliation_id LEFT JOIN (SELECT fin_reconciliation.fin_reconciliation_id, count(*) AS unrec_no, COALESCE(sum(fin_bankstatementline.cramount - fin_bankstatementline.dramount), 0) AS unrec_amt FROM fin_bankstatementline, fin_bankstatement, fin_reconciliation WHERE (fin_bankstatementline.fin_finacc_transaction_id IS NULL OR (EXISTS (SELECT 1 FROM fin_finacc_transaction, fin_reconciliation rec WHERE fin_finacc_transaction.fin_reconciliation_id = rec.fin_reconciliation_id AND fin_bankstatementline.fin_finacc_transaction_id = fin_finacc_transaction.fin_finacc_transaction_id AND fin_finacc_transaction.fin_financial_account_id = fin_bankstatement.fin_financial_account_id AND rec.created > fin_reconciliation.created))) AND fin_bankstatementline.datetrx <= fin_reconciliation.dateto AND fin_bankstatement.fin_bankstatement_id = fin_bankstatementline.fin_bankstatement_id AND fin_bankstatement.fin_financial_account_id = fin_reconciliation.fin_financial_account_id GROUP BY fin_reconciliation.fin_reconciliation_id) unrec ON fin_reconciliation.fin_reconciliation_id = unrec.fin_reconciliation_id LEFT JOIN (SELECT fin_reconciliation.fin_reconciliation_id, COALESCE(sum(CASE COALESCE(fin_finacc_transaction.paymentamt, 0) WHEN 0 THEN 0 ELSE 1 END), 0) AS payment_no, COALESCE(sum(fin_finacc_transaction.paymentamt), 0) AS payment_amt, COALESCE(sum(CASE COALESCE(fin_finacc_transaction.depositamt, 0) WHEN 0 THEN 0 ELSE 1 END), 0) AS deposit_no, COALESCE(sum(fin_finacc_transaction.depositamt), 0) AS deposit_amt FROM fin_finacc_transaction, fin_reconciliation WHERE (fin_finacc_transaction.fin_reconciliation_id IS NULL OR (EXISTS (SELECT 1 FROM fin_reconciliation r WHERE r.dateto > fin_reconciliation.dateto AND fin_finacc_transaction.fin_reconciliation_id = r.fin_reconciliation_id))) AND fin_finacc_transaction.statementdate <= fin_reconciliation.dateto AND fin_finacc_transaction.fin_financial_account_id = fin_reconciliation.fin_financial_account_id GROUP BY fin_reconciliation.fin_reconciliation_id) outstanding ON fin_reconciliation.fin_reconciliation_id = outstanding.fin_reconciliation_id]]></view>
+    <view name="APRM_RECONCILIATION_V"><![CDATA[SELECT fin_reconciliation.fin_reconciliation_id AS aprm_reconciliation_v_id, fin_reconciliation.fin_reconciliation_id, fin_reconciliation.ad_client_id, fin_reconciliation.ad_org_id, fin_reconciliation.created, fin_reconciliation.createdby, fin_reconciliation.updated, fin_reconciliation.updatedby, fin_reconciliation.isactive, fin_reconciliation.fin_financial_account_id, fin_reconciliation.documentno, fin_reconciliation.c_doctype_id, fin_reconciliation.dateto, fin_reconciliation.statementdate, fin_reconciliation.endingbalance, fin_reconciliation.startingbalance, fin_reconciliation.docstatus, fin_reconciliation.processing, fin_reconciliation.processed, fin_reconciliation.posted, fin_reconciliation.printdetailed, fin_reconciliation.em_aprm_process_reconciliation AS process_reconciliation, fin_reconciliation.printsummary, COALESCE(item.item_no, 0) AS item_no, COALESCE(item.item_amt, 0) AS item_amt, COALESCE(unrec.unrec_no, 0) AS unrec_no, COALESCE(unrec.unrec_amt, 0) AS unrec_amt, COALESCE(outstanding.payment_no, 0) AS payment_no, COALESCE(outstanding.payment_amt, 0) AS payment_amt, COALESCE(outstanding.deposit_no, 0) AS deposit_no, COALESCE(outstanding.deposit_amt, 0) AS deposit_amt, (SELECT ad_table.ad_table_id FROM ad_table WHERE lower(ad_table.tablename) = 'fin_reconciliation') AS forced_table_id FROM fin_reconciliation LEFT JOIN (SELECT fin_finacc_transaction.fin_reconciliation_id, count(*) AS item_no, COALESCE(sum(fin_finacc_transaction.depositamt - fin_finacc_transaction.paymentamt), 0) AS item_amt FROM fin_finacc_transaction GROUP BY fin_finacc_transaction.fin_reconciliation_id) item ON fin_reconciliation.fin_reconciliation_id = item.fin_reconciliation_id LEFT JOIN (SELECT fin_reconciliation_1.fin_reconciliation_id, count(*) AS unrec_no, COALESCE(sum(fin_bankstatementline.cramount - fin_bankstatementline.dramount), 0) AS unrec_amt FROM fin_bankstatementline, fin_bankstatement, fin_reconciliation fin_reconciliation_1 WHERE (fin_bankstatementline.fin_finacc_transaction_id IS NULL OR (EXISTS (SELECT 1 FROM fin_finacc_transaction, fin_reconciliation rec WHERE fin_finacc_transaction.fin_reconciliation_id = rec.fin_reconciliation_id AND fin_bankstatementline.fin_finacc_transaction_id = fin_finacc_transaction.fin_finacc_transaction_id AND fin_finacc_transaction.fin_financial_account_id = fin_bankstatement.fin_financial_account_id AND rec.created > fin_reconciliation_1.created))) AND fin_bankstatementline.datetrx <= fin_reconciliation_1.dateto AND fin_bankstatement.fin_bankstatement_id = fin_bankstatementline.fin_bankstatement_id AND fin_bankstatement.fin_financial_account_id = fin_reconciliation_1.fin_financial_account_id GROUP BY fin_reconciliation_1.fin_reconciliation_id) unrec ON fin_reconciliation.fin_reconciliation_id = unrec.fin_reconciliation_id LEFT JOIN (SELECT fin_reconciliation_1.fin_reconciliation_id, COALESCE(sum(CASE COALESCE(fin_finacc_transaction.paymentamt, 0) WHEN 0 THEN 0 ELSE 1 END), 0) AS payment_no, COALESCE(sum(fin_finacc_transaction.paymentamt), 0) AS payment_amt, COALESCE(sum(CASE COALESCE(fin_finacc_transaction.depositamt, 0) WHEN 0 THEN 0 ELSE 1 END), 0) AS deposit_no, COALESCE(sum(fin_finacc_transaction.depositamt), 0) AS deposit_amt FROM fin_finacc_transaction, fin_reconciliation fin_reconciliation_1 WHERE (fin_finacc_transaction.fin_reconciliation_id IS NULL OR (EXISTS (SELECT 1 FROM fin_reconciliation r WHERE r.dateto > fin_reconciliation_1.dateto AND fin_finacc_transaction.fin_reconciliation_id = r.fin_reconciliation_id))) AND fin_finacc_transaction.statementdate <= fin_reconciliation_1.dateto AND fin_finacc_transaction.fin_financial_account_id = fin_reconciliation_1.fin_financial_account_id GROUP BY fin_reconciliation_1.fin_reconciliation_id) outstanding ON fin_reconciliation.fin_reconciliation_id = outstanding.fin_reconciliation_id]]></view>
   </database>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Tue Feb 25 12:11:20 2014 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Tue Feb 25 16:21:31 2014 +0100
@@ -2396,6 +2396,41 @@
 <!--63454E73F07B4C908EB1268C41F5DE8A-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--63454E73F07B4C908EB1268C41F5DE8A--></AD_COLUMN>
 
+<!--670423B76C554A6C957A58F1DA4A6D98--><AD_COLUMN>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <AD_COLUMN_ID><![CDATA[670423B76C554A6C957A58F1DA4A6D98]]></AD_COLUMN_ID>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <NAME><![CDATA[Cost Center]]></NAME>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <DESCRIPTION><![CDATA[Division that adds to the cost of an organization]]></DESCRIPTION>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <HELP><![CDATA[Division that adds to the cost of an organization. Internal structure for cost allocation.]]></HELP>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <COLUMNNAME><![CDATA[C_Costcenter_ID]]></COLUMNNAME>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <AD_TABLE_ID><![CDATA[1BAA61D216CB4A62838AA785658EE092]]></AD_TABLE_ID>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <SEQNO><![CDATA[490]]></SEQNO>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <AD_ELEMENT_ID><![CDATA[BB1B0593596A4F63B2553183B11B0D28]]></AD_ELEMENT_ID>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <POSITION><![CDATA[49]]></POSITION>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--670423B76C554A6C957A58F1DA4A6D98--></AD_COLUMN>
+
 <!--68C853FD393C4620A3947EC34C416B9A--><AD_COLUMN>
 <!--68C853FD393C4620A3947EC34C416B9A-->  <AD_COLUMN_ID><![CDATA[68C853FD393C4620A3947EC34C416B9A]]></AD_COLUMN_ID>
 <!--68C853FD393C4620A3947EC34C416B9A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Tue Feb 25 12:11:20 2014 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Tue Feb 25 16:21:31 2014 +0100
@@ -2398,7 +2398,9 @@
 <!--2864F0DB02224A748B57719396E4338E-->  <AD_TAB_ID><![CDATA[2A9BA5FDA0F8470D881F8EA9DEDCC598]]></AD_TAB_ID>
 <!--2864F0DB02224A748B57719396E4338E-->  <AD_COLUMN_ID><![CDATA[A6B405E9791D4BC685220C11CCA916C0]]></AD_COLUMN_ID>
 <!--2864F0DB02224A748B57719396E4338E-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--2864F0DB02224A748B57719396E4338E-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--2864F0DB02224A748B57719396E4338E-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
+<!--2864F0DB02224A748B57719396E4338E-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--2864F0DB02224A748B57719396E4338E-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@]]></DISPLAYLOGIC>
 <!--2864F0DB02224A748B57719396E4338E-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
 <!--2864F0DB02224A748B57719396E4338E-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--2864F0DB02224A748B57719396E4338E-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
@@ -4591,6 +4593,36 @@
 <!--4BBE86A40070422CB644510F93C92F81-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--4BBE86A40070422CB644510F93C92F81--></AD_FIELD>
 
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F--><AD_FIELD>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <AD_FIELD_ID><![CDATA[4BF4CA0C5A5D4D2D945FD2373DD52B4F]]></AD_FIELD_ID>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <NAME><![CDATA[Cost Center]]></NAME>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <DESCRIPTION><![CDATA[Division that adds to the cost of an organization]]></DESCRIPTION>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <HELP><![CDATA[Division that adds to the cost of an organization. Internal structure for cost allocation.]]></HELP>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <AD_TAB_ID><![CDATA[2A9BA5FDA0F8470D881F8EA9DEDCC598]]></AD_TAB_ID>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <AD_COLUMN_ID><![CDATA[670423B76C554A6C957A58F1DA4A6D98]]></AD_COLUMN_ID>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@]]></DISPLAYLOGIC>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <SEQNO><![CDATA[210]]></SEQNO>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F--></AD_FIELD>
+
 <!--4C3D2B4E7CD14390BF20A8FB5474EE32--><AD_FIELD>
 <!--4C3D2B4E7CD14390BF20A8FB5474EE32-->  <AD_FIELD_ID><![CDATA[4C3D2B4E7CD14390BF20A8FB5474EE32]]></AD_FIELD_ID>
 <!--4C3D2B4E7CD14390BF20A8FB5474EE32-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -4688,7 +4720,9 @@
 <!--4CFDE354811341B1923BCD1AA449E1B0-->  <AD_TAB_ID><![CDATA[2A9BA5FDA0F8470D881F8EA9DEDCC598]]></AD_TAB_ID>
 <!--4CFDE354811341B1923BCD1AA449E1B0-->  <AD_COLUMN_ID><![CDATA[50D9D2D098E54FB7B5109C4BAA8977A5]]></AD_COLUMN_ID>
 <!--4CFDE354811341B1923BCD1AA449E1B0-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--4CFDE354811341B1923BCD1AA449E1B0-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--4CFDE354811341B1923BCD1AA449E1B0-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
+<!--4CFDE354811341B1923BCD1AA449E1B0-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--4CFDE354811341B1923BCD1AA449E1B0-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@]]></DISPLAYLOGIC>
 <!--4CFDE354811341B1923BCD1AA449E1B0-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
 <!--4CFDE354811341B1923BCD1AA449E1B0-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--4CFDE354811341B1923BCD1AA449E1B0-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
@@ -5521,6 +5555,7 @@
 <!--576653206CA64C59BF19A53B94AEDBA8-->  <AD_TAB_ID><![CDATA[2A9BA5FDA0F8470D881F8EA9DEDCC598]]></AD_TAB_ID>
 <!--576653206CA64C59BF19A53B94AEDBA8-->  <AD_COLUMN_ID><![CDATA[1D64AD4366EF4A209F2A462A8DE42735]]></AD_COLUMN_ID>
 <!--576653206CA64C59BF19A53B94AEDBA8-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--576653206CA64C59BF19A53B94AEDBA8-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
 <!--576653206CA64C59BF19A53B94AEDBA8-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--576653206CA64C59BF19A53B94AEDBA8-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@]]></DISPLAYLOGIC>
 <!--576653206CA64C59BF19A53B94AEDBA8-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
@@ -5888,6 +5923,7 @@
 <!--5E7451300D254B11B582F0FBA8F11D2A-->  <AD_TAB_ID><![CDATA[2A9BA5FDA0F8470D881F8EA9DEDCC598]]></AD_TAB_ID>
 <!--5E7451300D254B11B582F0FBA8F11D2A-->  <AD_COLUMN_ID><![CDATA[4B98FCB4357B49DA9DB7D79FD28838AF]]></AD_COLUMN_ID>
 <!--5E7451300D254B11B582F0FBA8F11D2A-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--5E7451300D254B11B582F0FBA8F11D2A-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
 <!--5E7451300D254B11B582F0FBA8F11D2A-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--5E7451300D254B11B582F0FBA8F11D2A-->  <DISPLAYLOGIC><![CDATA[@$Element_SR@='Y']]></DISPLAYLOGIC>
 <!--5E7451300D254B11B582F0FBA8F11D2A-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
@@ -11818,6 +11854,7 @@
 <!--970254B3E03D4A009FE4BF179AC61703-->  <AD_TAB_ID><![CDATA[2A9BA5FDA0F8470D881F8EA9DEDCC598]]></AD_TAB_ID>
 <!--970254B3E03D4A009FE4BF179AC61703-->  <AD_COLUMN_ID><![CDATA[E6DB13E1516947B7A8DC5741D58A7AB2]]></AD_COLUMN_ID>
 <!--970254B3E03D4A009FE4BF179AC61703-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--970254B3E03D4A009FE4BF179AC61703-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
 <!--970254B3E03D4A009FE4BF179AC61703-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--970254B3E03D4A009FE4BF179AC61703-->  <DISPLAYLOGIC><![CDATA[@$Element_MC@='Y']]></DISPLAYLOGIC>
 <!--970254B3E03D4A009FE4BF179AC61703-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
@@ -15411,6 +15448,7 @@
 <!--B2F1D76CA33240B69A4012D5CA370476-->  <AD_TAB_ID><![CDATA[2A9BA5FDA0F8470D881F8EA9DEDCC598]]></AD_TAB_ID>
 <!--B2F1D76CA33240B69A4012D5CA370476-->  <AD_COLUMN_ID><![CDATA[806198F4784445109D9067A0C868701C]]></AD_COLUMN_ID>
 <!--B2F1D76CA33240B69A4012D5CA370476-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--B2F1D76CA33240B69A4012D5CA370476-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
 <!--B2F1D76CA33240B69A4012D5CA370476-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--B2F1D76CA33240B69A4012D5CA370476-->  <DISPLAYLOGIC><![CDATA[@$Element_AS@='Y']]></DISPLAYLOGIC>
 <!--B2F1D76CA33240B69A4012D5CA370476-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
@@ -18469,6 +18507,64 @@
 <!--E1A05CE9F3FF433888C60B2F059480EC-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--E1A05CE9F3FF433888C60B2F059480EC--></AD_FIELD>
 
+<!--E1C580C830810696E040007F0100225E--><AD_FIELD>
+<!--E1C580C830810696E040007F0100225E-->  <AD_FIELD_ID><![CDATA[E1C580C830810696E040007F0100225E]]></AD_FIELD_ID>
+<!--E1C580C830810696E040007F0100225E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E1C580C830810696E040007F0100225E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E1C580C830810696E040007F0100225E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E1C580C830810696E040007F0100225E-->  <NAME><![CDATA[Invoice Paid]]></NAME>
+<!--E1C580C830810696E040007F0100225E-->  <DESCRIPTION><![CDATA[A flag indicating whether this document type is consider paid or not.]]></DESCRIPTION>
+<!--E1C580C830810696E040007F0100225E-->  <HELP><![CDATA[A flag indicating whether this document type is consider paid or not.]]></HELP>
+<!--E1C580C830810696E040007F0100225E-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--E1C580C830810696E040007F0100225E-->  <AD_TAB_ID><![CDATA[F6C2283A21314407BBBB23FF14B85ED4]]></AD_TAB_ID>
+<!--E1C580C830810696E040007F0100225E-->  <AD_COLUMN_ID><![CDATA[C5CABD48EA774B8289401E670504371C]]></AD_COLUMN_ID>
+<!--E1C580C830810696E040007F0100225E-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--E1C580C830810696E040007F0100225E-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--E1C580C830810696E040007F0100225E-->  <DISPLAYLOGIC><![CDATA[@InvoicePaidStatus@='Y']]></DISPLAYLOGIC>
+<!--E1C580C830810696E040007F0100225E-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--E1C580C830810696E040007F0100225E-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--E1C580C830810696E040007F0100225E-->  <SEQNO><![CDATA[280]]></SEQNO>
+<!--E1C580C830810696E040007F0100225E-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--E1C580C830810696E040007F0100225E-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--E1C580C830810696E040007F0100225E-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--E1C580C830810696E040007F0100225E-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--E1C580C830810696E040007F0100225E-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--E1C580C830810696E040007F0100225E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--E1C580C830810696E040007F0100225E-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--E1C580C830810696E040007F0100225E-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--E1C580C830810696E040007F0100225E-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--E1C580C830810696E040007F0100225E-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--E1C580C830810696E040007F0100225E--></AD_FIELD>
+
+<!--E215E9D7AE7B4C12E040007F01001D97--><AD_FIELD>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <AD_FIELD_ID><![CDATA[E215E9D7AE7B4C12E040007F01001D97]]></AD_FIELD_ID>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <NAME><![CDATA[Invoice Paid]]></NAME>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <DESCRIPTION><![CDATA[A flag indicating whether this document type is consider paid or not.]]></DESCRIPTION>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <HELP><![CDATA[A flag indicating whether this document type is consider paid or not.]]></HELP>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <AD_TAB_ID><![CDATA[9817E22E2536417F8C9AEC8D5FA33E18]]></AD_TAB_ID>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <AD_COLUMN_ID><![CDATA[C5CABD48EA774B8289401E670504371C]]></AD_COLUMN_ID>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <DISPLAYLOGIC><![CDATA[@InvoicePaidStatus@='Y']]></DISPLAYLOGIC>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <SEQNO><![CDATA[240]]></SEQNO>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--E215E9D7AE7B4C12E040007F01001D97--></AD_FIELD>
+
 <!--E452E6D8D7D14E56BFD0D9EFD22C2B4A--><AD_FIELD>
 <!--E452E6D8D7D14E56BFD0D9EFD22C2B4A-->  <AD_FIELD_ID><![CDATA[E452E6D8D7D14E56BFD0D9EFD22C2B4A]]></AD_FIELD_ID>
 <!--E452E6D8D7D14E56BFD0D9EFD22C2B4A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -18871,6 +18967,7 @@
 <!--E81BDEBDB5C0448DAECD48AA5857A091-->  <AD_TAB_ID><![CDATA[2A9BA5FDA0F8470D881F8EA9DEDCC598]]></AD_TAB_ID>
 <!--E81BDEBDB5C0448DAECD48AA5857A091-->  <AD_COLUMN_ID><![CDATA[528EE4D486444C08A1CE90CAA066BA48]]></AD_COLUMN_ID>
 <!--E81BDEBDB5C0448DAECD48AA5857A091-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--E81BDEBDB5C0448DAECD48AA5857A091-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
 <!--E81BDEBDB5C0448DAECD48AA5857A091-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--E81BDEBDB5C0448DAECD48AA5857A091-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@]]></DISPLAYLOGIC>
 <!--E81BDEBDB5C0448DAECD48AA5857A091-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Tue Feb 25 12:11:20 2014 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Tue Feb 25 16:21:31 2014 +0100
@@ -1177,6 +1177,18 @@
 <!--F381A9CA5B51447286C117C68394C6BA-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--F381A9CA5B51447286C117C68394C6BA--></AD_MESSAGE>
 
+<!--F4500597D99243129F93A0769047CFCB--><AD_MESSAGE>
+<!--F4500597D99243129F93A0769047CFCB-->  <AD_MESSAGE_ID><![CDATA[F4500597D99243129F93A0769047CFCB]]></AD_MESSAGE_ID>
+<!--F4500597D99243129F93A0769047CFCB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F4500597D99243129F93A0769047CFCB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F4500597D99243129F93A0769047CFCB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F4500597D99243129F93A0769047CFCB-->  <VALUE><![CDATA[APRM_TaxPaymentReactivation]]></VALUE>
+<!--F4500597D99243129F93A0769047CFCB-->  <MSGTEXT><![CDATA[Tax payments can not be reactivated.]]></MSGTEXT>
+<!--F4500597D99243129F93A0769047CFCB-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--F4500597D99243129F93A0769047CFCB-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--F4500597D99243129F93A0769047CFCB-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--F4500597D99243129F93A0769047CFCB--></AD_MESSAGE>
+
 <!--F579E42461DC472AA4F21B14DD3D680B--><AD_MESSAGE>
 <!--F579E42461DC472AA4F21B14DD3D680B-->  <AD_MESSAGE_ID><![CDATA[F579E42461DC472AA4F21B14DD3D680B]]></AD_MESSAGE_ID>
 <!--F579E42461DC472AA4F21B14DD3D680B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 25 12:11:20 2014 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 25 16:21:31 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.21096]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.22125]]></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>
@@ -25,7 +25,7 @@
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <UPDATEINFO><![CDATA[Fixed issue with document sequence numbers reset in case of applying dataset second time.
 Fixed issue 15305.]]></UPDATEINFO>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <REFERENCEDATAINFO><![CDATA[Document types and default algorithm for bank statement auto matching]]></REFERENCEDATAINFO>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION_LABEL><![CDATA[MP27.1]]></VERSION_LABEL>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--A918E3331C404B889D69AA9BFAFB23AC--></AD_MODULE>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 25 12:11:20 2014 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 25 16:21:31 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.21096]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.22125]]></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.21096]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.22125]]></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_PREFERENCE.xml	Tue Feb 25 12:11:20 2014 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PREFERENCE.xml	Tue Feb 25 16:21:31 2014 +0100
@@ -22,17 +22,6 @@
 <!--3DBC63716B7C4FF6846CA092EA058BE8-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--3DBC63716B7C4FF6846CA092EA058BE8--></AD_PREFERENCE>
 
-<!--43ECD009731844E38DEA2EA80D790D6F--><AD_PREFERENCE>
-<!--43ECD009731844E38DEA2EA80D790D6F-->  <AD_PREFERENCE_ID><![CDATA[43ECD009731844E38DEA2EA80D790D6F]]></AD_PREFERENCE_ID>
-<!--43ECD009731844E38DEA2EA80D790D6F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--43ECD009731844E38DEA2EA80D790D6F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--43ECD009731844E38DEA2EA80D790D6F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--43ECD009731844E38DEA2EA80D790D6F-->  <ATTRIBUTE><![CDATA[IsCustomerBalanceRestored]]></ATTRIBUTE>
-<!--43ECD009731844E38DEA2EA80D790D6F-->  <VALUE><![CDATA[Y]]></VALUE>
-<!--43ECD009731844E38DEA2EA80D790D6F-->  <ISPROPERTYLIST><![CDATA[N]]></ISPROPERTYLIST>
-<!--43ECD009731844E38DEA2EA80D790D6F-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--43ECD009731844E38DEA2EA80D790D6F--></AD_PREFERENCE>
-
 <!--4AF17D34610443D7B69447C68D1B0420--><AD_PREFERENCE>
 <!--4AF17D34610443D7B69447C68D1B0420-->  <AD_PREFERENCE_ID><![CDATA[4AF17D34610443D7B69447C68D1B0420]]></AD_PREFERENCE_ID>
 <!--4AF17D34610443D7B69447C68D1B0420-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS.xml	Tue Feb 25 12:11:20 2014 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS.xml	Tue Feb 25 16:21:31 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_REFERENCE.xml	Tue Feb 25 12:11:20 2014 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml	Tue Feb 25 16:21:31 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/AD_TAB.xml	Tue Feb 25 12:11:20 2014 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml	Tue Feb 25 16:21:31 2014 +0100
@@ -27,6 +27,7 @@
 <!--15ECCF8974044A81982F57F9F1E1A67B-->  <HQLWHERECLAUSE><![CDATA[e.invoice.salesTransaction = true and e.outstandingAmount <> 0]]></HQLWHERECLAUSE>
 <!--15ECCF8974044A81982F57F9F1E1A67B-->  <HQLORDERBYCLAUSE><![CDATA[e.invoice.documentNo, e.duedate]]></HQLORDERBYCLAUSE>
 <!--15ECCF8974044A81982F57F9F1E1A67B-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--15ECCF8974044A81982F57F9F1E1A67B-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--15ECCF8974044A81982F57F9F1E1A67B-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
 <!--15ECCF8974044A81982F57F9F1E1A67B-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--15ECCF8974044A81982F57F9F1E1A67B-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
@@ -57,6 +58,7 @@
 <!--1EA4A3F31A27483A8C6E93176AE912D3-->  <HQLWHERECLAUSE><![CDATA[e.table.id = '30721072789F410E9606D2235CB2A226' and e.recordID = @FIN_Doubtful_Debt.id@]]></HQLWHERECLAUSE>
 <!--1EA4A3F31A27483A8C6E93176AE912D3-->  <HQLORDERBYCLAUSE><![CDATA[accountingSchema.name, accountingDate, abs(debit) desc, credit desc, value]]></HQLORDERBYCLAUSE>
 <!--1EA4A3F31A27483A8C6E93176AE912D3-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--1EA4A3F31A27483A8C6E93176AE912D3-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--1EA4A3F31A27483A8C6E93176AE912D3-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
 <!--1EA4A3F31A27483A8C6E93176AE912D3-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--1EA4A3F31A27483A8C6E93176AE912D3-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
@@ -87,6 +89,7 @@
 <!--2A9BA5FDA0F8470D881F8EA9DEDCC598-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
 <!--2A9BA5FDA0F8470D881F8EA9DEDCC598-->  <HQLORDERBYCLAUSE><![CDATA[accountingSchema.name, accountingDate, abs(debit) desc, credit desc, value]]></HQLORDERBYCLAUSE>
 <!--2A9BA5FDA0F8470D881F8EA9DEDCC598-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--2A9BA5FDA0F8470D881F8EA9DEDCC598-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--2A9BA5FDA0F8470D881F8EA9DEDCC598-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
 <!--2A9BA5FDA0F8470D881F8EA9DEDCC598-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--2A9BA5FDA0F8470D881F8EA9DEDCC598-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
@@ -118,6 +121,7 @@
 <!--2ECAED4620B840BA8DD738140F58A629-->  <HQLWHERECLAUSE><![CDATA[e.invoice.salesTransaction = false and e.outstandingAmount <> 0]]></HQLWHERECLAUSE>
 <!--2ECAED4620B840BA8DD738140F58A629-->  <HQLORDERBYCLAUSE><![CDATA[e.invoice.documentNo, e.duedate]]></HQLORDERBYCLAUSE>
 <!--2ECAED4620B840BA8DD738140F58A629-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--2ECAED4620B840BA8DD738140F58A629-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--2ECAED4620B840BA8DD738140F58A629-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
 <!--2ECAED4620B840BA8DD738140F58A629-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--2ECAED4620B840BA8DD738140F58A629-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
@@ -151,6 +155,7 @@
 AND ((@FIN_DoubtFul_Debt_Run.businessPartner@ is null OR @FIN_DoubtFul_Debt_Run.businessPartner@ = '') OR (@FIN_DoubtFul_Debt_Run.businessPartner@ is not null and e.businessPartner.id = @FIN_DoubtFul_Debt_Run.businessPartner@))
 AND ((@FIN_DoubtFul_Debt_Run.businessPartnerCategory@ is null OR @FIN_DoubtFul_Debt_Run.businessPartnerCategory@ = '') OR (@FIN_DoubtFul_Debt_Run.businessPartnerCategory@ is not null and e.businessPartnerCategory.id = @FIN_DoubtFul_Debt_Run.businessPartnerCategory@)))]]></HQLFILTERCLAUSE>
 <!--3FD616A223E44621806A8573068B6C62-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--3FD616A223E44621806A8573068B6C62-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--3FD616A223E44621806A8573068B6C62-->  <EM_OBUIAPP_SELECTION><![CDATA[OB.APRM.selectDoubtfulDebtPickAndEdit]]></EM_OBUIAPP_SELECTION>
 <!--3FD616A223E44621806A8573068B6C62-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
 <!--3FD616A223E44621806A8573068B6C62-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
@@ -179,6 +184,7 @@
 <!--5B9941AC1F6A4529A76FCA7CDA0A7D7A-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--5B9941AC1F6A4529A76FCA7CDA0A7D7A-->  <UIPATTERN><![CDATA[SR]]></UIPATTERN>
 <!--5B9941AC1F6A4529A76FCA7CDA0A7D7A-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--5B9941AC1F6A4529A76FCA7CDA0A7D7A-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--5B9941AC1F6A4529A76FCA7CDA0A7D7A-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
 <!--5B9941AC1F6A4529A76FCA7CDA0A7D7A-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--5B9941AC1F6A4529A76FCA7CDA0A7D7A-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
@@ -207,6 +213,7 @@
 <!--60825C9E68644DBC9C530DDCABE05A6E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--60825C9E68644DBC9C530DDCABE05A6E-->  <UIPATTERN><![CDATA[SR]]></UIPATTERN>
 <!--60825C9E68644DBC9C530DDCABE05A6E-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--60825C9E68644DBC9C530DDCABE05A6E-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--60825C9E68644DBC9C530DDCABE05A6E-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
 <!--60825C9E68644DBC9C530DDCABE05A6E-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--60825C9E68644DBC9C530DDCABE05A6E-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
@@ -234,6 +241,7 @@
 <!--6707D7449A8D45DB851F608BA88329C8-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--6707D7449A8D45DB851F608BA88329C8-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
 <!--6707D7449A8D45DB851F608BA88329C8-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--6707D7449A8D45DB851F608BA88329C8-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--6707D7449A8D45DB851F608BA88329C8-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
 <!--6707D7449A8D45DB851F608BA88329C8-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--6707D7449A8D45DB851F608BA88329C8-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
@@ -262,6 +270,7 @@
 <!--79DFBE24B39742AD877E3163643E619F-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--79DFBE24B39742AD877E3163643E619F-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
 <!--79DFBE24B39742AD877E3163643E619F-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--79DFBE24B39742AD877E3163643E619F-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--79DFBE24B39742AD877E3163643E619F-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
 <!--79DFBE24B39742AD877E3163643E619F-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--79DFBE24B39742AD877E3163643E619F-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
@@ -290,6 +299,7 @@
 <!--7A8D43541F8C49F1BD8A431A0041BF89-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--7A8D43541F8C49F1BD8A431A0041BF89-->  <UIPATTERN><![CDATA[SR]]></UIPATTERN>
 <!--7A8D43541F8C49F1BD8A431A0041BF89-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--7A8D43541F8C49F1BD8A431A0041BF89-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--7A8D43541F8C49F1BD8A431A0041BF89-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
 <!--7A8D43541F8C49F1BD8A431A0041BF89-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--7A8D43541F8C49F1BD8A431A0041BF89-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
@@ -316,6 +326,7 @@
 <!--7BE8B207C88947C498677C172ECDDECC-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--7BE8B207C88947C498677C172ECDDECC-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--7BE8B207C88947C498677C172ECDDECC-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--7BE8B207C88947C498677C172ECDDECC-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--7BE8B207C88947C498677C172ECDDECC-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
 <!--7BE8B207C88947C498677C172ECDDECC-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--7BE8B207C88947C498677C172ECDDECC-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
@@ -345,6 +356,7 @@
 <!--81644A22CC4D4B879AA71C33C30E00A4-->  <HQLORDERBYCLAUSE><![CDATA[obSelected desc, paymentPriority, expectedDate, coalesce(orderDocumentno, invoiceorderDocumentno)]]></HQLORDERBYCLAUSE>
 <!--81644A22CC4D4B879AA71C33C30E00A4-->  <HQLFILTERCLAUSE><![CDATA[(e.obSelected = true) OR (e.paymentMethod.id = @FIN_Payment_Proposal.paymentMethod@)]]></HQLFILTERCLAUSE>
 <!--81644A22CC4D4B879AA71C33C30E00A4-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--81644A22CC4D4B879AA71C33C30E00A4-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--81644A22CC4D4B879AA71C33C30E00A4-->  <EM_OBUIAPP_SELECTION><![CDATA[OB.APRM.selectionChangePaymentProposalPickAndEdit]]></EM_OBUIAPP_SELECTION>
 <!--81644A22CC4D4B879AA71C33C30E00A4-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
 <!--81644A22CC4D4B879AA71C33C30E00A4-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
@@ -374,6 +386,7 @@
 <!--89C009D99323470DB51F100697E2F50C-->  <HQLWHERECLAUSE><![CDATA[e.invoice.id=@Invoice.id@ AND ABS(e.received) < ABS(e.expected)]]></HQLWHERECLAUSE>
 <!--89C009D99323470DB51F100697E2F50C-->  <HQLORDERBYCLAUSE><![CDATA[dueDate asc]]></HQLORDERBYCLAUSE>
 <!--89C009D99323470DB51F100697E2F50C-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--89C009D99323470DB51F100697E2F50C-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--89C009D99323470DB51F100697E2F50C-->  <EM_OBUIAPP_CAN_ADD><![CDATA[Y]]></EM_OBUIAPP_CAN_ADD>
 <!--89C009D99323470DB51F100697E2F50C-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[Y]]></EM_OBUIAPP_CAN_DELETE>
 <!--89C009D99323470DB51F100697E2F50C-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[N]]></EM_OBUIAPP_SHOW_SELECT>
@@ -404,6 +417,7 @@
 <!--9380E9AFB1074FB98030E5549D7FF346-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--9380E9AFB1074FB98030E5549D7FF346-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--9380E9AFB1074FB98030E5549D7FF346-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--9380E9AFB1074FB98030E5549D7FF346-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--9380E9AFB1074FB98030E5549D7FF346-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
 <!--9380E9AFB1074FB98030E5549D7FF346-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--9380E9AFB1074FB98030E5549D7FF346-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
@@ -434,6 +448,7 @@
 <!--9817E22E2536417F8C9AEC8D5FA33E18-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
 <!--9817E22E2536417F8C9AEC8D5FA33E18-->  <HQLWHERECLAUSE><![CDATA[e.paymentDetails is not null]]></HQLWHERECLAUSE>
 <!--9817E22E2536417F8C9AEC8D5FA33E18-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--9817E22E2536417F8C9AEC8D5FA33E18-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--9817E22E2536417F8C9AEC8D5FA33E18-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
 <!--9817E22E2536417F8C9AEC8D5FA33E18-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--9817E22E2536417F8C9AEC8D5FA33E18-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
@@ -460,6 +475,7 @@
 <!--9D859A2A50F44562AFA21AAF2DF91B8A-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--9D859A2A50F44562AFA21AAF2DF91B8A-->  <UIPATTERN><![CDATA[ED]]></UIPATTERN>
 <!--9D859A2A50F44562AFA21AAF2DF91B8A-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--9D859A2A50F44562AFA21AAF2DF91B8A-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--9D859A2A50F44562AFA21AAF2DF91B8A-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
 <!--9D859A2A50F44562AFA21AAF2DF91B8A-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--9D859A2A50F44562AFA21AAF2DF91B8A-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
@@ -488,6 +504,7 @@
 <!--A94442B27F664A41BF64735DFA76FB4D-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--A94442B27F664A41BF64735DFA76FB4D-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
 <!--A94442B27F664A41BF64735DFA76FB4D-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--A94442B27F664A41BF64735DFA76FB4D-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--A94442B27F664A41BF64735DFA76FB4D-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
 <!--A94442B27F664A41BF64735DFA76FB4D-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--A94442B27F664A41BF64735DFA76FB4D-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
@@ -515,6 +532,7 @@
 <!--B82C02920AA84E8DB57D553185BD2F06-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--B82C02920AA84E8DB57D553185BD2F06-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
 <!--B82C02920AA84E8DB57D553185BD2F06-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--B82C02920AA84E8DB57D553185BD2F06-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--B82C02920AA84E8DB57D553185BD2F06-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
 <!--B82C02920AA84E8DB57D553185BD2F06-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--B82C02920AA84E8DB57D553185BD2F06-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
@@ -543,6 +561,7 @@
 <!--C095D2CC39704DBE8B906B7CD7710968-->  <UIPATTERN><![CDATA[SR]]></UIPATTERN>
 <!--C095D2CC39704DBE8B906B7CD7710968-->  <HQLORDERBYCLAUSE><![CDATA[-transactionDate]]></HQLORDERBYCLAUSE>
 <!--C095D2CC39704DBE8B906B7CD7710968-->  <SHOWPARENTBUTTONS><![CDATA[N]]></SHOWPARENTBUTTONS>
+<!--C095D2CC39704DBE8B906B7CD7710968-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--C095D2CC39704DBE8B906B7CD7710968-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
 <!--C095D2CC39704DBE8B906B7CD7710968-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--C095D2CC39704DBE8B906B7CD7710968-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
@@ -571,6 +590,7 @@
 <!--D4D450A66C754D65940DBC36B11779C8-->  <HQLWHERECLAUSE><![CDATA[e.invoice.id=@Invoice.id@ AND ABS(e.received) < ABS(e.expected)]]></HQLWHERECLAUSE>
 <!--D4D450A66C754D65940DBC36B11779C8-->  <HQLORDERBYCLAUSE><![CDATA[dueDate asc]]></HQLORDERBYCLAUSE>
 <!--D4D450A66C754D65940DBC36B11779C8-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--D4D450A66C754D65940DBC36B11779C8-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--D4D450A66C754D65940DBC36B11779C8-->  <EM_OBUIAPP_CAN_ADD><![CDATA[Y]]></EM_OBUIAPP_CAN_ADD>
 <!--D4D450A66C754D65940DBC36B11779C8-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[Y]]></EM_OBUIAPP_CAN_DELETE>
 <!--D4D450A66C754D65940DBC36B11779C8-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[N]]></EM_OBUIAPP_SHOW_SELECT>
@@ -598,6 +618,7 @@
 <!--E4DC11F751F34F0DAE11A4D856CD99EB-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--E4DC11F751F34F0DAE11A4D856CD99EB-->  <UIPATTERN><![CDATA[SR]]></UIPATTERN>
 <!--E4DC11F751F34F0DAE11A4D856CD99EB-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--E4DC11F751F34F0DAE11A4D856CD99EB-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--E4DC11F751F34F0DAE11A4D856CD99EB-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
 <!--E4DC11F751F34F0DAE11A4D856CD99EB-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--E4DC11F751F34F0DAE11A4D856CD99EB-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
@@ -626,6 +647,7 @@
 <!--EB0466B2A22343F28773B356D292BC7E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--EB0466B2A22343F28773B356D292BC7E-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
 <!--EB0466B2A22343F28773B356D292BC7E-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--EB0466B2A22343F28773B356D292BC7E-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--EB0466B2A22343F28773B356D292BC7E-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
 <!--EB0466B2A22343F28773B356D292BC7E-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--EB0466B2A22343F28773B356D292BC7E-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
@@ -653,6 +675,7 @@
 <!--EB0E0C5A58344F7FA345097E7365CD22-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--EB0E0C5A58344F7FA345097E7365CD22-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
 <!--EB0E0C5A58344F7FA345097E7365CD22-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--EB0E0C5A58344F7FA345097E7365CD22-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--EB0E0C5A58344F7FA345097E7365CD22-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
 <!--EB0E0C5A58344F7FA345097E7365CD22-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--EB0E0C5A58344F7FA345097E7365CD22-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
@@ -683,6 +706,7 @@
 <!--F6C2283A21314407BBBB23FF14B85ED4-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
 <!--F6C2283A21314407BBBB23FF14B85ED4-->  <HQLWHERECLAUSE><![CDATA[e.paymentDetails is not null]]></HQLWHERECLAUSE>
 <!--F6C2283A21314407BBBB23FF14B85ED4-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--F6C2283A21314407BBBB23FF14B85ED4-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--F6C2283A21314407BBBB23FF14B85ED4-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
 <!--F6C2283A21314407BBBB23FF14B85ED4-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--F6C2283A21314407BBBB23FF14B85ED4-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
@@ -711,6 +735,7 @@
 <!--F9751D712A804D57B97A36803843F2D7-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--F9751D712A804D57B97A36803843F2D7-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
 <!--F9751D712A804D57B97A36803843F2D7-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--F9751D712A804D57B97A36803843F2D7-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--F9751D712A804D57B97A36803843F2D7-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
 <!--F9751D712A804D57B97A36803843F2D7-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--F9751D712A804D57B97A36803843F2D7-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
@@ -738,6 +763,7 @@
 <!--FA57D75B1BBB4583B4A777008A29BF54-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--FA57D75B1BBB4583B4A777008A29BF54-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
 <!--FA57D75B1BBB4583B4A777008A29BF54-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--FA57D75B1BBB4583B4A777008A29BF54-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--FA57D75B1BBB4583B4A777008A29BF54-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
 <!--FA57D75B1BBB4583B4A777008A29BF54-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--FA57D75B1BBB4583B4A777008A29BF54-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
@@ -765,6 +791,7 @@
 <!--FA66A130BE8B48E88BF4F5A6E2FA0CDD-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--FA66A130BE8B48E88BF4F5A6E2FA0CDD-->  <HQLORDERBYCLAUSE><![CDATA[rundate]]></HQLORDERBYCLAUSE>
 <!--FA66A130BE8B48E88BF4F5A6E2FA0CDD-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--FA66A130BE8B48E88BF4F5A6E2FA0CDD-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--FA66A130BE8B48E88BF4F5A6E2FA0CDD-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
 <!--FA66A130BE8B48E88BF4F5A6E2FA0CDD-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--FA66A130BE8B48E88BF4F5A6E2FA0CDD-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
@@ -793,6 +820,7 @@
 <!--FD40D9C2F1F14943933DEFEF4A8458E4-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--FD40D9C2F1F14943933DEFEF4A8458E4-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
 <!--FD40D9C2F1F14943933DEFEF4A8458E4-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--FD40D9C2F1F14943933DEFEF4A8458E4-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--FD40D9C2F1F14943933DEFEF4A8458E4-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
 <!--FD40D9C2F1F14943933DEFEF4A8458E4-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--FD40D9C2F1F14943933DEFEF4A8458E4-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
@@ -821,6 +849,7 @@
 <!--FF8080812F213146012F2135BC25000E-->  <UIPATTERN><![CDATA[SR]]></UIPATTERN>
 <!--FF8080812F213146012F2135BC25000E-->  <HQLFILTERCLAUSE><![CDATA[e.reconciled = false]]></HQLFILTERCLAUSE>
 <!--FF8080812F213146012F2135BC25000E-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--FF8080812F213146012F2135BC25000E-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--FF8080812F213146012F2135BC25000E-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
 <!--FF8080812F213146012F2135BC25000E-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--FF8080812F213146012F2135BC25000E-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
@@ -850,6 +879,7 @@
 <!--FF80808130BB89090130BB9A3A2B0043-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
 <!--FF80808130BB89090130BB9A3A2B0043-->  <HQLORDERBYCLAUSE><![CDATA[-accountingDate, accountingSchema.id, groupID, documentCategory, financialAccountTransaction.id, -sequenceNumber]]></HQLORDERBYCLAUSE>
 <!--FF80808130BB89090130BB9A3A2B0043-->  <SHOWPARENTBUTTONS><![CDATA[N]]></SHOWPARENTBUTTONS>
+<!--FF80808130BB89090130BB9A3A2B0043-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--FF80808130BB89090130BB9A3A2B0043-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
 <!--FF80808130BB89090130BB9A3A2B0043-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--FF80808130BB89090130BB9A3A2B0043-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
@@ -877,6 +907,7 @@
 <!--FF8080813320657F0133209DE21B0042-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--FF8080813320657F0133209DE21B0042-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--FF8080813320657F0133209DE21B0042-->  <SHOWPARENTBUTTONS><![CDATA[N]]></SHOWPARENTBUTTONS>
+<!--FF8080813320657F0133209DE21B0042-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--FF8080813320657F0133209DE21B0042-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
 <!--FF8080813320657F0133209DE21B0042-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--FF8080813320657F0133209DE21B0042-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml	Tue Feb 25 12:11:20 2014 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml	Tue Feb 25 16:21:31 2014 +0100
@@ -11,6 +11,28 @@
 <!--119E4BFBC4264A148450053A47E7D3FE-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--119E4BFBC4264A148450053A47E7D3FE--></AD_VAL_RULE>
 
+<!--1D824F88E32F4282B26C48B5A910B006--><AD_VAL_RULE>
+<!--1D824F88E32F4282B26C48B5A910B006-->  <AD_VAL_RULE_ID><![CDATA[1D824F88E32F4282B26C48B5A910B006]]></AD_VAL_RULE_ID>
+<!--1D824F88E32F4282B26C48B5A910B006-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1D824F88E32F4282B26C48B5A910B006-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1D824F88E32F4282B26C48B5A910B006-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1D824F88E32F4282B26C48B5A910B006-->  <NAME><![CDATA[FIN_Payment Out status validation]]></NAME>
+<!--1D824F88E32F4282B26C48B5A910B006-->  <TYPE><![CDATA[S]]></TYPE>
+<!--1D824F88E32F4282B26C48B5A910B006-->  <CODE><![CDATA[Value not IN ('RPR','RDNC') and seqno >=(select seqno FROM ad_ref_list WHERE ad_reference_id = '575BCB88A4694C27BC013DE9C73E6FE7' and value='PPM')]]></CODE>
+<!--1D824F88E32F4282B26C48B5A910B006-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--1D824F88E32F4282B26C48B5A910B006--></AD_VAL_RULE>
+
+<!--27D8D0FDAE4742229DC64888DF9CB8A8--><AD_VAL_RULE>
+<!--27D8D0FDAE4742229DC64888DF9CB8A8-->  <AD_VAL_RULE_ID><![CDATA[27D8D0FDAE4742229DC64888DF9CB8A8]]></AD_VAL_RULE_ID>
+<!--27D8D0FDAE4742229DC64888DF9CB8A8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--27D8D0FDAE4742229DC64888DF9CB8A8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--27D8D0FDAE4742229DC64888DF9CB8A8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--27D8D0FDAE4742229DC64888DF9CB8A8-->  <NAME><![CDATA[FIN_Payment In status validation]]></NAME>
+<!--27D8D0FDAE4742229DC64888DF9CB8A8-->  <TYPE><![CDATA[S]]></TYPE>
+<!--27D8D0FDAE4742229DC64888DF9CB8A8-->  <CODE><![CDATA[Value not IN  ('PPM','PWNC') and seqno >=(select seqno FROM ad_ref_list WHERE ad_reference_id = '575BCB88A4694C27BC013DE9C73E6FE7' and value='RPR')]]></CODE>
+<!--27D8D0FDAE4742229DC64888DF9CB8A8-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--27D8D0FDAE4742229DC64888DF9CB8A8--></AD_VAL_RULE>
+
 <!--29010995FD39439D97A5C0CE8CE27D70--><AD_VAL_RULE>
 <!--29010995FD39439D97A5C0CE8CE27D70-->  <AD_VAL_RULE_ID><![CDATA[29010995FD39439D97A5C0CE8CE27D70]]></AD_VAL_RULE_ID>
 <!--29010995FD39439D97A5C0CE8CE27D70-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PROCESS.xml	Tue Feb 25 12:11:20 2014 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PROCESS.xml	Tue Feb 25 16:21:31 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 12:11:20 2014 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Tue Feb 25 16:21:31 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 12:11:20 2014 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml	Tue Feb 25 16:21:31 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 12:11:20 2014 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/TestUtility.java	Tue Feb 25 16:21:31 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-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalance.java	Tue Feb 25 12:11:20 2014 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalance.java	Tue Feb 25 16:21:31 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 Openbravo SLU
+ * All portions are Copyright (C) 2011-2014 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -35,6 +35,7 @@
       // If the preference does not exist in the database yet the modulescript must be executed.
       boolean isCustomerBalanceFixed = UpdateCustomerBalanceData.isCustomerBalanceFixed(cp);
       if (!isCustomerBalanceFixed) {
+        UpdateCustomerBalanceData.createPreference(cp);
         // Reset the customer balance to 0
         UpdateCustomerBalanceData.resetCustomerCredit(cp);
         // Obtain the correct customer balance
--- a/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalance_data.xsql	Tue Feb 25 12:11:20 2014 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalance_data.xsql	Tue Feb 25 16:21:31 2014 +0100
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
  ************************************************************************************
- * Copyright (C) 2011 Openbravo S.L.U.
+ * Copyright (C) 2011-2014 Openbravo S.L.U.
  * Licensed under the Openbravo Commercial License version 1.0
  * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
  * or in the legal folder of this module distribution.
@@ -24,6 +24,7 @@
         SELECT count(*) as existpreference
         FROM ad_preference
         WHERE attribute = 'IsCustomerBalanceRestored'
+        AND ad_module_id = NULL 
       ]]>
     </Sql>
   </SqlMethod>
@@ -66,4 +67,20 @@
     <Parameter name="cumstomeCredit"/>
     <Parameter name="businessPartnerId"/>
   </SqlMethod>
+  <SqlMethod name="createPreference" type="preparedStatement" return="rowcount">
+    <SqlMethodComment></SqlMethodComment>
+    <Sql>
+      <![CDATA[
+        INSERT INTO ad_preference (
+          ad_preference_id, ad_client_id, ad_org_id, isactive,
+          createdby, created, updatedby, updated,
+          attribute, value
+        ) VALUES (
+          get_uuid(), '0', '0', 'Y',
+          '0', NOW(), '0', NOW(),
+          'IsCustomerBalanceRestored', 'Y'
+        )
+      ]]>
+    </Sql>
+  </SqlMethod>
 </SqlClass>
--- a/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdateTransactionBPExchangeRate_data.xsql	Tue Feb 25 12:11:20 2014 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdateTransactionBPExchangeRate_data.xsql	Tue Feb 25 16:21:31 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) 2012 Openbravo SLU
+ * All portions are Copyright (C) 2012-2013 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -32,8 +32,9 @@
     <Sql>
       <![CDATA[
         SELECT COUNT(1) AS NAME FROM DUAL
-        WHERE EXISTS(SELECT 1 FROM FIN_FINACC_TRANSACTION, FIN_PAYMENT 
-                              WHERE FIN_FINACC_TRANSACTION.C_BPARTNER_ID IS NULL AND FIN_PAYMENT.C_BPARTNER_ID IS NOT NULL)
+        WHERE EXISTS(SELECT 1 FROM FIN_FINACC_TRANSACTION FT
+                     LEFT JOIN FIN_PAYMENT FP ON FP.FIN_PAYMENT_ID = FT.FIN_PAYMENT_ID 
+                     WHERE FT.C_BPARTNER_ID IS NULL AND FP.C_BPARTNER_ID IS NOT NULL)
       ]]>
     </Sql>
   </SqlMethod>
@@ -42,9 +43,10 @@
     <Sql>
       <![CDATA[
         UPDATE FIN_FINACC_TRANSACTION SET C_BPARTNER_ID = (SELECT C_BPARTNER_ID FROM FIN_PAYMENT WHERE FIN_PAYMENT_ID = FIN_FINACC_TRANSACTION.FIN_PAYMENT_ID)
-        WHERE EXISTS(SELECT 1 FROM FIN_FINACC_TRANSACTION FT, FIN_PAYMENT 
-                                                    WHERE FT.C_BPARTNER_ID IS NULL AND FIN_PAYMENT.C_BPARTNER_ID IS NOT NULL
-                                                    AND FT.FIN_FINACC_TRANSACTION_ID = FIN_FINACC_TRANSACTION.FIN_FINACC_TRANSACTION_ID)
+        WHERE EXISTS(SELECT 1 FROM FIN_FINACC_TRANSACTION FT 
+                     LEFT JOIN FIN_PAYMENT FP ON FP.FIN_PAYMENT_ID = FT.FIN_PAYMENT_ID
+                     WHERE FT.C_BPARTNER_ID IS NULL AND FP.C_BPARTNER_ID IS NOT NULL
+                     AND FT.FIN_FINACC_TRANSACTION_ID = FIN_FINACC_TRANSACTION.FIN_FINACC_TRANSACTION_ID)
       ]]>
     </Sql>
   </SqlMethod>
--- a/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalanceData.java	Tue Feb 25 12:11:20 2014 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalanceData.java	Tue Feb 25 16:21:31 2014 +0100
@@ -96,7 +96,8 @@
     strSql = strSql + 
       "        SELECT count(*) as existpreference" +
       "        FROM ad_preference" +
-      "        WHERE attribute = 'IsCustomerBalanceRestored'";
+      "        WHERE attribute = 'IsCustomerBalanceRestored'" +
+      "        AND ad_module_id = NULL ";
 
     ResultSet result;
     boolean boolReturn = false;
@@ -251,4 +252,40 @@
     }
     return(updateCount);
   }
+
+  public static int createPreference(ConnectionProvider connectionProvider)    throws ServletException {
+    String strSql = "";
+    strSql = strSql + 
+      "        INSERT INTO ad_preference (" +
+      "          ad_preference_id, ad_client_id, ad_org_id, isactive," +
+      "          createdby, created, updatedby, updated," +
+      "          attribute, value" +
+      "        ) VALUES (" +
+      "          get_uuid(), '0', '0', 'Y'," +
+      "          '0', NOW(), '0', NOW()," +
+      "          'IsCustomerBalanceRestored', 'Y'" +
+      "        )";
+
+    int updateCount = 0;
+    PreparedStatement st = null;
+
+    try {
+    st = connectionProvider.getPreparedStatement(strSql);
+
+      updateCount = st.executeUpdate();
+    } catch(SQLException e){
+      log4j.error("SQL error in query: " + strSql + "Exception:"+ e);
+      throw new ServletException("@CODE=" + Integer.toString(e.getErrorCode()) + "@" + e.getMessage());
+    } catch(Exception ex){
+      log4j.error("Exception in query: " + strSql + "Exception:"+ ex);
+      throw new ServletException("@CODE=@" + ex.getMessage());
+    } finally {
+      try {
+        connectionProvider.releasePreparedStatement(st);
+      } catch(Exception ignore){
+        ignore.printStackTrace();
+      }
+    }
+    return(updateCount);
+  }
 }
--- a/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/UpdateTransactionBPExchangeRateData.java	Tue Feb 25 12:11:20 2014 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/UpdateTransactionBPExchangeRateData.java	Tue Feb 25 16:21:31 2014 +0100
@@ -87,8 +87,9 @@
     String strSql = "";
     strSql = strSql + 
       "        SELECT COUNT(1) AS NAME FROM DUAL" +
-      "        WHERE EXISTS(SELECT 1 FROM FIN_FINACC_TRANSACTION, FIN_PAYMENT " +
-      "                              WHERE FIN_FINACC_TRANSACTION.C_BPARTNER_ID IS NULL AND FIN_PAYMENT.C_BPARTNER_ID IS NOT NULL)";
+      "        WHERE EXISTS(SELECT 1 FROM FIN_FINACC_TRANSACTION FT" +
+      "                     LEFT JOIN FIN_PAYMENT FP ON FP.FIN_PAYMENT_ID = FT.FIN_PAYMENT_ID " +
+      "                     WHERE FT.C_BPARTNER_ID IS NULL AND FP.C_BPARTNER_ID IS NOT NULL)";
 
     ResultSet result;
     boolean boolReturn = false;
@@ -122,9 +123,10 @@
     String strSql = "";
     strSql = strSql + 
       "        UPDATE FIN_FINACC_TRANSACTION SET C_BPARTNER_ID = (SELECT C_BPARTNER_ID FROM FIN_PAYMENT WHERE FIN_PAYMENT_ID = FIN_FINACC_TRANSACTION.FIN_PAYMENT_ID)" +
-      "        WHERE EXISTS(SELECT 1 FROM FIN_FINACC_TRANSACTION FT, FIN_PAYMENT " +
-      "                                                    WHERE FT.C_BPARTNER_ID IS NULL AND FIN_PAYMENT.C_BPARTNER_ID IS NOT NULL" +
-      "                                                    AND FT.FIN_FINACC_TRANSACTION_ID = FIN_FINACC_TRANSACTION.FIN_FINACC_TRANSACTION_ID)";
+      "        WHERE EXISTS(SELECT 1 FROM FIN_FINACC_TRANSACTION FT " +
+      "                     LEFT JOIN FIN_PAYMENT FP ON FP.FIN_PAYMENT_ID = FT.FIN_PAYMENT_ID" +
+      "                     WHERE FT.C_BPARTNER_ID IS NULL AND FP.C_BPARTNER_ID IS NOT NULL" +
+      "                     AND FT.FIN_FINACC_TRANSACTION_ID = FIN_FINACC_TRANSACTION.FIN_FINACC_TRANSACTION_ID)";
 
     int updateCount = 0;
     PreparedStatement st = null;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ProcessInvoiceHook.java	Tue Feb 25 16:21:31 2014 +0100
@@ -0,0 +1,39 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * 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 Rights Reserved.
+ * Contributor(s):  
+ *************************************************************************
+ */
+package org.openbravo.advpaymentmngt;
+
+import org.openbravo.erpCommon.utility.OBError;
+import org.openbravo.model.common.invoice.Invoice;
+
+/**
+ * @author <a href="mailto:daniel.martins@xpand-it.com">Daniel Martins</a>
+ * 
+ */
+public interface ProcessInvoiceHook {
+
+  /*
+   * Returns an OBError when an error occurred and null if it succeed
+   */
+  public OBError preProcess(Invoice invoice, String strDocAction);
+
+  /*
+   * Returns an OBError when an error occurred and null if it succeed
+   */
+  public OBError postProcess(Invoice invoice, String strDocAction);
+}
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html	Tue Feb 25 12:11:20 2014 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html	Tue Feb 25 16:21:31 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-2013 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -328,7 +328,7 @@
         cellGLItemDim.appendChild(textNode);
         cellGLItemDim.className = 'DataGrid_Body_Cell';
         cellCount++;
-      } else if (OB.APRM.APFT_GLItems[i][glAcctDimsDesc[acctDim].replace("Desc", "Displayed")]) {
+      } else if (OB.APRM.APFT_GLItems[i][glAcctDimsDesc[acctDim].replace("Desc", "Displayed")] === 'Y') {
         // The Acct. Dimen is displayed and the user has left it empty
         cellGLItemDim = row.insertCell(cellCount);
         textNode = document.createTextNode("");
@@ -336,6 +336,26 @@
         cellGLItemDim.className = 'DataGrid_Body_Cell';
         cellCount++;
       }
+      if(cellCount <= 4 && acctDim === (glAcctDimsDesc.length-1)) {
+        var newElements;
+        if (glAcctDimsDesc.length > 4) {
+          newElements = glAcctDimsDescnext.slice(0, 1);
+          if(newElements.length > 0) {
+            glAcctDimsDesc.push(newElements[0]);
+            if((glAcctDimsDescnext.length)-1 === 0) {
+                glAcctDimsDescnext = [];
+            } else {
+              glAcctDimsDescnext = glAcctDimsDescnext.slice((glAcctDimsDescnext.length)-1);
+            }
+          }
+        } else {
+          newElements = glAcctDimsDescnext.slice(0, (glAcctDimsDesc.length)-(cellCount-1));
+          for(addElement = 0; addElement < newElements.length; addElement++) {
+              glAcctDimsDesc.push(newElements[addElement]);
+          }
+          glAcctDimsDescnext = glAcctDimsDescnext.slice(((glAcctDimsDescnext.length)-(cellCount-1)));
+        }
+      }
     }
     
     cellGLITemReceivedInAmt = row.insertCell(cellCount);
@@ -390,7 +410,7 @@
             cellGLItemDim.appendChild(textNode);
             cellGLItemDim.className = 'DataGrid_Body_Cell';
             cellCount++;
-          } else if (OB.APRM.APFT_GLItems[i][glAcctDimsDescnext[acctDim].replace("Desc", "Displayed")]) {
+          } else if (OB.APRM.APFT_GLItems[i][glAcctDimsDescnext[acctDim].replace("Desc", "Displayed")] === 'Y') {
             // The Acct. Dimen is displayed and the user has left it empty
             cellGLItemDim = row.insertCell(cellCount);
             textNode = document.createTextNode("");
@@ -681,54 +701,135 @@
     displayLogicElement(dimension + '_th', isDisplayed)
   }
   var displayTitle = false;
+  var table = document.getElementById('sectionGLItemGridHeader');
+  var row = table.rows;
+  var rowLength = row.length;
+  var cellCount = 1, rowCount = 0, lastRow = rowLength-1, lastCell = (row[lastRow].cells.length)-1;
   if (document.frmMain.strElement_BP.value === 'Y' && isDisplayed) {
+    row[rowCount].cells[cellCount].innerHTML = 'Business Partner';
+    row[rowCount].cells[cellCount].id = 'c_bpartner_id_th';
+    cellCount++;
     displayLogicDimension('c_bpartner_id', true);
     displayTitle = true;
   } else {
+    row[lastRow].cells[lastCell].id = 'c_bpartner_id_th';
+    lastCell--;
     displayLogicDimension('c_bpartner_id', false);
   }  
   if (document.frmMain.strElement_AY.value === 'Y' && isDisplayed) {
+    row[rowCount].cells[cellCount].innerHTML = 'Activity';
+    row[rowCount].cells[cellCount].id = 'c_activity_id_th';
+    cellCount++;
     displayLogicDimension('c_activity_id', true);
     displayTitle = true;
   } else {
+    row[lastRow].cells[lastCell].id = 'c_activity_id_th';
+    lastCell--;
     displayLogicDimension('c_activity_id', false);
   }
   
   if (document.frmMain.strElement_PR.value === 'Y' && isDisplayed) {
+    row[rowCount].cells[cellCount].innerHTML = 'Product';
+    row[rowCount].cells[cellCount].id = 'm_product_id_th';
+    cellCount++;
     displayLogicDimension('m_product_id', true);
     displayTitle = true;
   } else {
+    row[lastRow].cells[lastCell].id = 'm_product_id_th';
+    lastCell--;
     displayLogicDimension('m_product_id', false);
   }
+
   if (document.frmMain.strElement_MC.value === 'Y' && isDisplayed) {
+    row[rowCount].cells[cellCount].innerHTML = 'Campaign';
+    row[rowCount].cells[cellCount].id = 'c_campaign_id_th';
+    cellCount++;
     displayLogicDimension('c_campaign_id', true);
     displayTitle = true;
   } else {
+    row[lastRow].cells[lastCell].id = 'c_campaign_id_th';
+    lastCell--;
     displayLogicDimension('c_campaign_id', false);
   }
   
+  if(cellCount > 4) {
+      rowCount++;
+      cellCount = 0;
+  }
+
+  if(lastCell < 0) {
+      lastRow --;
+      lastCell = (row[lastRow].cells.length)-4;
+  }
   if (document.frmMain.strElement_PJ.value === 'Y' && isDisplayed) {
+    row[rowCount].cells[cellCount].innerHTML = 'Project';
+    row[rowCount].cells[cellCount].id = 'c_project_id_th';
+    cellCount++;
     displayLogicDimension('c_project_id', true);
     displayTitle = true;
   } else {
+    row[lastRow].cells[lastCell].id = 'c_project_id_th';
+    lastCell--;
     displayLogicDimension('c_project_id', false);
   }
+  if(cellCount > 4) {
+      rowCount++;
+      cellCount = 0;
+  }
+
+  if(lastCell < 0) {
+      lastRow --;
+      lastCell = (row[lastRow].cells.length)-4;
+  }
   if (document.frmMain.strElement_CC.value === 'Y' && isDisplayed) {
+    row[rowCount].cells[cellCount].innerHTML = 'Cost Center';
+    row[rowCount].cells[cellCount].id = 'c_costcenter_id_th';
+    cellCount++;
     displayLogicDimension('c_costcenter_id', true);
     displayTitle = true;
   } else {
+    row[lastRow].cells[lastCell].id = 'c_costcenter_id_th';
+    lastCell--;
     displayLogicDimension('c_costcenter_id', false);
   }
+  if(cellCount > 4) {
+      rowCount++;
+      cellCount = 0;
+  }
+
+  if(lastCell < 0) {
+      lastRow --;
+      lastCell = (row[lastRow].cells.length)-4;
+  }
   if (document.frmMain.strElement_U1.value === 'Y' && isDisplayed) {
+    row[rowCount].cells[cellCount].innerHTML = '1st Dimension';
+    row[rowCount].cells[cellCount].id = 'user1_id_th';
+    cellCount++;
     displayLogicDimension('user1_id', true);
     displayTitle = true;
   } else {
+    row[lastRow].cells[lastCell].id = 'user1_id_th';
+    lastCell--;