pi merge
authorAsier Lostalé <asier.lostale@openbravo.com>
Mon, 02 Aug 2010 08:18:10 +0200
changeset 8107 8ffc637b9a01
parent 8106 5da510ace7ae (current diff)
parent 8004 86885cba1239 (diff)
child 8108 5f544d09bddf
pi merge
src-db/database/model/triggers/AD_MODULE_VERSION_TRG.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
web/js/dojotoolkit/dijit/themes/lucid/Calendar.css
web/js/dojotoolkit/dijit/themes/lucid/Calendar_rtl.css
web/js/dojotoolkit/dijit/themes/lucid/ColorPalette.css
web/js/dojotoolkit/dijit/themes/lucid/Common.css
web/js/dojotoolkit/dijit/themes/lucid/Dialog.css
web/js/dojotoolkit/dijit/themes/lucid/Dialog_rtl.css
web/js/dojotoolkit/dijit/themes/lucid/Editor.css
web/js/dojotoolkit/dijit/themes/lucid/Editor_rtl.css
web/js/dojotoolkit/dijit/themes/lucid/Menu.css
web/js/dojotoolkit/dijit/themes/lucid/Menu_rtl.css
web/js/dojotoolkit/dijit/themes/lucid/ProgressBar.css
web/js/dojotoolkit/dijit/themes/lucid/TimePicker.css
web/js/dojotoolkit/dijit/themes/lucid/TitlePane.css
web/js/dojotoolkit/dijit/themes/lucid/TitlePane_rtl.css
web/js/dojotoolkit/dijit/themes/lucid/Toolbar.css
web/js/dojotoolkit/dijit/themes/lucid/Tree.css
web/js/dojotoolkit/dijit/themes/lucid/Tree_rtl.css
web/js/dojotoolkit/dijit/themes/lucid/form/Button.css
web/js/dojotoolkit/dijit/themes/lucid/form/Button_rtl.css
web/js/dojotoolkit/dijit/themes/lucid/form/Checkbox.css
web/js/dojotoolkit/dijit/themes/lucid/form/Common.css
web/js/dojotoolkit/dijit/themes/lucid/form/Common_rtl.css
web/js/dojotoolkit/dijit/themes/lucid/form/NumberSpinner.css
web/js/dojotoolkit/dijit/themes/lucid/form/RadioButton.css
web/js/dojotoolkit/dijit/themes/lucid/form/Select.css
web/js/dojotoolkit/dijit/themes/lucid/form/Slider.css
web/js/dojotoolkit/dijit/themes/lucid/form/Slider_rtl.css
web/js/dojotoolkit/dijit/themes/lucid/form/images/arrowdown.png
web/js/dojotoolkit/dijit/themes/lucid/form/images/arrowdown_active.png
web/js/dojotoolkit/dijit/themes/lucid/form/images/arrowdown_disabled.png
web/js/dojotoolkit/dijit/themes/lucid/form/images/arrowup.png
web/js/dojotoolkit/dijit/themes/lucid/form/images/arrowup_active.png
web/js/dojotoolkit/dijit/themes/lucid/form/images/arrowup_disabled.png
web/js/dojotoolkit/dijit/themes/lucid/form/images/button.png
web/js/dojotoolkit/dijit/themes/lucid/form/images/buttonArrows.png
web/js/dojotoolkit/dijit/themes/lucid/form/images/button_grad_d.png
web/js/dojotoolkit/dijit/themes/lucid/form/images/button_ie6_grad.png
web/js/dojotoolkit/dijit/themes/lucid/form/images/button_ie6_grad_h.png
web/js/dojotoolkit/dijit/themes/lucid/form/images/button_ie6_grad_s.png
web/js/dojotoolkit/dijit/themes/lucid/form/images/checkboxAndRadioButtons_IE6.png
web/js/dojotoolkit/dijit/themes/lucid/form/images/checkboxRadioButtonStates.png
web/js/dojotoolkit/dijit/themes/lucid/form/images/error.png
web/js/dojotoolkit/dijit/themes/lucid/form/images/icon_drop_down.png
web/js/dojotoolkit/dijit/themes/lucid/form/images/ie6/radio_active.png
web/js/dojotoolkit/dijit/themes/lucid/form/images/ie6/radio_checked.png
web/js/dojotoolkit/dijit/themes/lucid/form/images/ie6/radio_checked_disabled.png
web/js/dojotoolkit/dijit/themes/lucid/form/images/ie6/radio_checked_hover.png
web/js/dojotoolkit/dijit/themes/lucid/form/images/ie6/radio_disabled.png
web/js/dojotoolkit/dijit/themes/lucid/form/images/ie6/radio_hover.png
web/js/dojotoolkit/dijit/themes/lucid/form/images/menubutton_back.png
web/js/dojotoolkit/dijit/themes/lucid/form/images/new_back - Copy.png
web/js/dojotoolkit/dijit/themes/lucid/form/images/shadow.png
web/js/dojotoolkit/dijit/themes/lucid/form/images/textBox_back.png
web/js/dojotoolkit/dijit/themes/lucid/form/images/textBox_back_checked.png
web/js/dojotoolkit/dijit/themes/lucid/form/images/textBox_back_hover.png
web/js/dojotoolkit/dijit/themes/lucid/form/images/white_grad.png
web/js/dojotoolkit/dijit/themes/lucid/form/images/white_grad_shadow.png
web/js/dojotoolkit/dijit/themes/lucid/images/accordionItemActive.gif
web/js/dojotoolkit/dijit/themes/lucid/images/accordionItemHover.gif
web/js/dojotoolkit/dijit/themes/lucid/images/accordion_back.gif
web/js/dojotoolkit/dijit/themes/lucid/images/accordion_back.png
web/js/dojotoolkit/dijit/themes/lucid/images/accordion_down.gif
web/js/dojotoolkit/dijit/themes/lucid/images/accordion_down.png
web/js/dojotoolkit/dijit/themes/lucid/images/arrowdown.gif
web/js/dojotoolkit/dijit/themes/lucid/images/arrowdown.png
web/js/dojotoolkit/dijit/themes/lucid/images/arrowdown_disabled.gif
web/js/dojotoolkit/dijit/themes/lucid/images/arrowdown_disabled.png
web/js/dojotoolkit/dijit/themes/lucid/images/arrowdown_down.gif
web/js/dojotoolkit/dijit/themes/lucid/images/arrowdown_down.png
web/js/dojotoolkit/dijit/themes/lucid/images/arrowdown_focus.gif
web/js/dojotoolkit/dijit/themes/lucid/images/arrowdown_focus.png
web/js/dojotoolkit/dijit/themes/lucid/images/arrowleft.gif
web/js/dojotoolkit/dijit/themes/lucid/images/arrowleft.png
web/js/dojotoolkit/dijit/themes/lucid/images/arrowleft_disabled.gif
web/js/dojotoolkit/dijit/themes/lucid/images/arrowleft_disabled.png
web/js/dojotoolkit/dijit/themes/lucid/images/arrowleft_down.gif
web/js/dojotoolkit/dijit/themes/lucid/images/arrowleft_down.png
web/js/dojotoolkit/dijit/themes/lucid/images/arrowleft_focus.gif
web/js/dojotoolkit/dijit/themes/lucid/images/arrowleft_focus.png
web/js/dojotoolkit/dijit/themes/lucid/images/arrowright.gif
web/js/dojotoolkit/dijit/themes/lucid/images/arrowright.png
web/js/dojotoolkit/dijit/themes/lucid/images/arrowright_disabled.gif
web/js/dojotoolkit/dijit/themes/lucid/images/arrowright_disabled.png
web/js/dojotoolkit/dijit/themes/lucid/images/arrowright_down.gif
web/js/dojotoolkit/dijit/themes/lucid/images/arrowright_down.png
web/js/dojotoolkit/dijit/themes/lucid/images/arrowright_focus.gif
web/js/dojotoolkit/dijit/themes/lucid/images/arrowright_focus.png
web/js/dojotoolkit/dijit/themes/lucid/images/arrowup.gif
web/js/dojotoolkit/dijit/themes/lucid/images/arrowup.png
web/js/dojotoolkit/dijit/themes/lucid/images/arrowup_disabled.gif
web/js/dojotoolkit/dijit/themes/lucid/images/arrowup_disabled.png
web/js/dojotoolkit/dijit/themes/lucid/images/arrowup_down.gif
web/js/dojotoolkit/dijit/themes/lucid/images/arrowup_down.png
web/js/dojotoolkit/dijit/themes/lucid/images/arrowup_focus.gif
web/js/dojotoolkit/dijit/themes/lucid/images/arrowup_focus.png
web/js/dojotoolkit/dijit/themes/lucid/images/bottom_grad.png
web/js/dojotoolkit/dijit/themes/lucid/images/calendarArrows.png
web/js/dojotoolkit/dijit/themes/lucid/images/calendarArrows8bit.png
web/js/dojotoolkit/dijit/themes/lucid/images/calendarContainerImages.png
web/js/dojotoolkit/dijit/themes/lucid/images/calendar_back_arrow.png
web/js/dojotoolkit/dijit/themes/lucid/images/calendar_back_arrow_hover.png
web/js/dojotoolkit/dijit/themes/lucid/images/calendar_back_arrow_mousedown.png
web/js/dojotoolkit/dijit/themes/lucid/images/calendar_cell_bg.png
web/js/dojotoolkit/dijit/themes/lucid/images/calendar_cell_off_day_bg.png
web/js/dojotoolkit/dijit/themes/lucid/images/calendar_cell_selected_bg.png
web/js/dojotoolkit/dijit/themes/lucid/images/calendar_forward_arrow.png
web/js/dojotoolkit/dijit/themes/lucid/images/calendar_forward_arrow_hover.png
web/js/dojotoolkit/dijit/themes/lucid/images/calendar_forward_arrow_mousedown.png
web/js/dojotoolkit/dijit/themes/lucid/images/calendar_grad.png
web/js/dojotoolkit/dijit/themes/lucid/images/calendar_icon.png
web/js/dojotoolkit/dijit/themes/lucid/images/calendar_month_button_hover.png
web/js/dojotoolkit/dijit/themes/lucid/images/calendar_year_button_hover.png
web/js/dojotoolkit/dijit/themes/lucid/images/calendar_year_icon.png
web/js/dojotoolkit/dijit/themes/lucid/images/checkmark.gif
web/js/dojotoolkit/dijit/themes/lucid/images/checkmark.png
web/js/dojotoolkit/dijit/themes/lucid/images/checkmarkNoBorder.gif
web/js/dojotoolkit/dijit/themes/lucid/images/checkmarkNoBorder.png
web/js/dojotoolkit/dijit/themes/lucid/images/colorPaletteBorder.png
web/js/dojotoolkit/dijit/themes/lucid/images/colorPaletteMouseDown.png
web/js/dojotoolkit/dijit/themes/lucid/images/dialog_close_icon.gif
web/js/dojotoolkit/dijit/themes/lucid/images/dialog_close_icon.png
web/js/dojotoolkit/dijit/themes/lucid/images/dialog_close_icon_hover.gif
web/js/dojotoolkit/dijit/themes/lucid/images/dialog_close_icon_hover.png
web/js/dojotoolkit/dijit/themes/lucid/images/dialog_close_icon_mousedown.gif
web/js/dojotoolkit/dijit/themes/lucid/images/dialog_close_icon_mousedown.png
web/js/dojotoolkit/dijit/themes/lucid/images/dialog_contentarea_shadow.png
web/js/dojotoolkit/dijit/themes/lucid/images/dialog_titlebar_back.png
web/js/dojotoolkit/dijit/themes/lucid/images/dijitMenuBack.png
web/js/dojotoolkit/dijit/themes/lucid/images/dividerLine.png
web/js/dojotoolkit/dijit/themes/lucid/images/dojo_sample.png
web/js/dojotoolkit/dijit/themes/lucid/images/drop_top_grad.png
web/js/dojotoolkit/dijit/themes/lucid/images/editor.gif
web/js/dojotoolkit/dijit/themes/lucid/images/editorDisabled.gif
web/js/dojotoolkit/dijit/themes/lucid/images/editorDisabled_rtl.gif
web/js/dojotoolkit/dijit/themes/lucid/images/editorMaster.png
web/js/dojotoolkit/dijit/themes/lucid/images/editor_rtl.gif
web/js/dojotoolkit/dijit/themes/lucid/images/folderClosed.gif
web/js/dojotoolkit/dijit/themes/lucid/images/folderOpened.gif
web/js/dojotoolkit/dijit/themes/lucid/images/i.gif
web/js/dojotoolkit/dijit/themes/lucid/images/i_half.gif
web/js/dojotoolkit/dijit/themes/lucid/images/i_half_rtl.gif
web/js/dojotoolkit/dijit/themes/lucid/images/i_rtl.gif
web/js/dojotoolkit/dijit/themes/lucid/images/input_alert.png
web/js/dojotoolkit/dijit/themes/lucid/images/leaf.gif
web/js/dojotoolkit/dijit/themes/lucid/images/loadingAnimation.gif
web/js/dojotoolkit/dijit/themes/lucid/images/popupMenuBg.gif
web/js/dojotoolkit/dijit/themes/lucid/images/preciseSliderThumb.gif
web/js/dojotoolkit/dijit/themes/lucid/images/preciseSliderThumb.png
web/js/dojotoolkit/dijit/themes/lucid/images/preciseSliderThumbDisabled.gif
web/js/dojotoolkit/dijit/themes/lucid/images/preciseSliderThumbDisabled.png
web/js/dojotoolkit/dijit/themes/lucid/images/preciseSliderThumbDown.gif
web/js/dojotoolkit/dijit/themes/lucid/images/preciseSliderThumbDown.png
web/js/dojotoolkit/dijit/themes/lucid/images/preciseSliderThumbFocus.gif
web/js/dojotoolkit/dijit/themes/lucid/images/preciseSliderThumbFocus.png
web/js/dojotoolkit/dijit/themes/lucid/images/preciseSliderThumbHover.gif
web/js/dojotoolkit/dijit/themes/lucid/images/preciseSliderThumbHover.png
web/js/dojotoolkit/dijit/themes/lucid/images/progressBarAnim.gif
web/js/dojotoolkit/dijit/themes/lucid/images/progressBarEmpty.png
web/js/dojotoolkit/dijit/themes/lucid/images/progressBarEmptyShadow.png
web/js/dojotoolkit/dijit/themes/lucid/images/progressBarFull.png
web/js/dojotoolkit/dijit/themes/lucid/images/shadow.png
web/js/dojotoolkit/dijit/themes/lucid/images/sliderEmpty.gif
web/js/dojotoolkit/dijit/themes/lucid/images/sliderEmpty.png
web/js/dojotoolkit/dijit/themes/lucid/images/sliderEmptyFocus.gif
web/js/dojotoolkit/dijit/themes/lucid/images/sliderEmptyFocus.png
web/js/dojotoolkit/dijit/themes/lucid/images/sliderEmptyVertical.gif
web/js/dojotoolkit/dijit/themes/lucid/images/sliderEmptyVertical.png
web/js/dojotoolkit/dijit/themes/lucid/images/sliderEmptyVerticalFocus.gif
web/js/dojotoolkit/dijit/themes/lucid/images/sliderEmptyVerticalFocus.png
web/js/dojotoolkit/dijit/themes/lucid/images/sliderFull.gif
web/js/dojotoolkit/dijit/themes/lucid/images/sliderFull.png
web/js/dojotoolkit/dijit/themes/lucid/images/sliderFullFocus.gif
web/js/dojotoolkit/dijit/themes/lucid/images/sliderFullFocus.png
web/js/dojotoolkit/dijit/themes/lucid/images/sliderFullVertical.gif
web/js/dojotoolkit/dijit/themes/lucid/images/sliderFullVertical.png
web/js/dojotoolkit/dijit/themes/lucid/images/sliderFullVerticalFocus.gif
web/js/dojotoolkit/dijit/themes/lucid/images/sliderFullVerticalFocus.png
web/js/dojotoolkit/dijit/themes/lucid/images/sliderThumb.gif
web/js/dojotoolkit/dijit/themes/lucid/images/sliderThumb.png
web/js/dojotoolkit/dijit/themes/lucid/images/sliderThumbDisabled.gif
web/js/dojotoolkit/dijit/themes/lucid/images/sliderThumbDisabled.png
web/js/dojotoolkit/dijit/themes/lucid/images/sliderThumbDown.gif
web/js/dojotoolkit/dijit/themes/lucid/images/sliderThumbDown.png
web/js/dojotoolkit/dijit/themes/lucid/images/sliderThumbFocus.gif
web/js/dojotoolkit/dijit/themes/lucid/images/sliderThumbFocus.png
web/js/dojotoolkit/dijit/themes/lucid/images/sliderThumbHover.gif
web/js/dojotoolkit/dijit/themes/lucid/images/sliderThumbHover.png
web/js/dojotoolkit/dijit/themes/lucid/images/splitterH.png
web/js/dojotoolkit/dijit/themes/lucid/images/splitterV.png
web/js/dojotoolkit/dijit/themes/lucid/images/spriteArrows.gif
web/js/dojotoolkit/dijit/themes/lucid/images/spriteArrows.png
web/js/dojotoolkit/dijit/themes/lucid/images/table_td_bg.png
web/js/dojotoolkit/dijit/themes/lucid/images/textBox_back.png
web/js/dojotoolkit/dijit/themes/lucid/images/textBox_back_checked.png
web/js/dojotoolkit/dijit/themes/lucid/images/textBox_back_hover.png
web/js/dojotoolkit/dijit/themes/lucid/images/textBox_breakdown.png
web/js/dojotoolkit/dijit/themes/lucid/images/textBox_sample.png
web/js/dojotoolkit/dijit/themes/lucid/images/titleBar.png
web/js/dojotoolkit/dijit/themes/lucid/images/titleBarBg.gif
web/js/dojotoolkit/dijit/themes/lucid/images/tooltipConnectorDown.gif
web/js/dojotoolkit/dijit/themes/lucid/images/tooltipConnectorDown.png
web/js/dojotoolkit/dijit/themes/lucid/images/tooltipConnectorLeft.gif
web/js/dojotoolkit/dijit/themes/lucid/images/tooltipConnectorLeft.png
web/js/dojotoolkit/dijit/themes/lucid/images/tooltipConnectorRight.gif
web/js/dojotoolkit/dijit/themes/lucid/images/tooltipConnectorRight.png
web/js/dojotoolkit/dijit/themes/lucid/images/tooltipConnectorUp.gif
web/js/dojotoolkit/dijit/themes/lucid/images/tooltipConnectorUp.png
web/js/dojotoolkit/dijit/themes/lucid/images/tooltip_back.gif
web/js/dojotoolkit/dijit/themes/lucid/images/tooltip_back.png
web/js/dojotoolkit/dijit/themes/lucid/images/top_grad.png
web/js/dojotoolkit/dijit/themes/lucid/images/trans.png
web/js/dojotoolkit/dijit/themes/lucid/images/treeExpand_leaf.gif
web/js/dojotoolkit/dijit/themes/lucid/images/treeExpand_leaf_rtl.gif
web/js/dojotoolkit/dijit/themes/lucid/images/treeExpand_loading.gif
web/js/dojotoolkit/dijit/themes/lucid/images/treeExpand_minus.gif
web/js/dojotoolkit/dijit/themes/lucid/images/treeExpand_minus.png
web/js/dojotoolkit/dijit/themes/lucid/images/treeExpand_minus_hover.png
web/js/dojotoolkit/dijit/themes/lucid/images/treeExpand_minus_rtl.gif
web/js/dojotoolkit/dijit/themes/lucid/images/treeExpand_mius.gif
web/js/dojotoolkit/dijit/themes/lucid/images/treeExpand_plus.gif
web/js/dojotoolkit/dijit/themes/lucid/images/treeExpand_plus.png
web/js/dojotoolkit/dijit/themes/lucid/images/treeExpand_plus_hover.png
web/js/dojotoolkit/dijit/themes/lucid/images/treeExpand_plus_rtl.gif
web/js/dojotoolkit/dijit/themes/lucid/images/treeHover.png
web/js/dojotoolkit/dijit/themes/lucid/images/tree_breakdown.png
web/js/dojotoolkit/dijit/themes/lucid/images/tree_sample.png
web/js/dojotoolkit/dijit/themes/lucid/images/white_grad.gif
web/js/dojotoolkit/dijit/themes/lucid/images/white_grad.png
web/js/dojotoolkit/dijit/themes/lucid/images/white_grad_shadow.png
web/js/dojotoolkit/dijit/themes/lucid/images/year_dwn_arrow_icon.png
web/js/dojotoolkit/dijit/themes/lucid/images/year_up_arrow_icon.png
web/js/dojotoolkit/dijit/themes/lucid/layout/AccordionContainer.css
web/js/dojotoolkit/dijit/themes/lucid/layout/BorderContainer.css
web/js/dojotoolkit/dijit/themes/lucid/layout/ContentPane.css
web/js/dojotoolkit/dijit/themes/lucid/layout/TabContainer.css
web/js/dojotoolkit/dijit/themes/lucid/layout/TabContainer_rtl.css
web/js/dojotoolkit/dijit/themes/lucid/layout/images/accordion.png
web/js/dojotoolkit/dijit/themes/lucid/layout/images/splitterHorizontalHover.png
web/js/dojotoolkit/dijit/themes/lucid/layout/images/splitterVerticalHover.png
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tabBottom.png
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tabClose.png
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tabLeft.png
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tabNested.png
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tabRight.png
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tabTop.png
web/js/dojotoolkit/dijit/themes/lucid/lucid.css
web/js/dojotoolkit/dijit/themes/nihilo/images/editor.gif
web/js/dojotoolkit/dijit/themes/nihilo/images/editorDisabled.gif
web/js/dojotoolkit/dijit/themes/nihilo/images/editorDisabled_rtl.gif
web/js/dojotoolkit/dijit/themes/nihilo/images/editor_rtl.gif
web/js/dojotoolkit/dijit/themes/soria/images/editor.gif
web/js/dojotoolkit/dijit/themes/soria/images/editorDisabled.gif
web/js/dojotoolkit/dijit/themes/soria/images/editorDisabled_rtl.gif
web/js/dojotoolkit/dijit/themes/soria/images/editor_rtl.gif
web/js/dojotoolkit/dijit/themes/tundra/images/editor.gif
web/js/dojotoolkit/dijit/themes/tundra/images/editorDisabled.gif
web/js/dojotoolkit/dijit/themes/tundra/images/editorDisabled_rtl.gif
web/js/dojotoolkit/dijit/themes/tundra/images/editorMaster.png
web/js/dojotoolkit/dijit/themes/tundra/images/editor_rtl.gif
web/js/dojotoolkit/dojo/cldr/nls/de-de/number.js
web/js/dojotoolkit/dojo/cldr/nls/en-us/currency.js
web/js/dojotoolkit/dojo/cldr/nls/en-us/number.js
web/js/dojotoolkit/dojo/cldr/nls/es-es/gregorian.js
web/js/dojotoolkit/dojo/cldr/nls/es-es/number.js
web/js/dojotoolkit/dojo/cldr/nls/islamic-civil.js
web/js/dojotoolkit/dojo/cldr/nls/it-it/gregorian.js
web/js/dojotoolkit/dojo/cldr/nls/ja-jp/number.js
web/js/dojotoolkit/dojo/cldr/nls/ko-kr/gregorian.js
web/js/dojotoolkit/dojo/cldr/nls/ko-kr/number.js
web/js/dojotoolkit/dojo/cldr/nls/pt-br/gregorian.js
web/js/dojotoolkit/dojo/cldr/nls/zh-cn/gregorian.js
web/js/dojotoolkit/dojo/cldr/nls/zh-cn/number.js
web/js/dojotoolkit/dojo/cldr/nls/zh-tw/number.js
web/js/dojotoolkit/dojox/editor/plugins/resources/icons/findIcon.gif
web/js/dojotoolkit/dojox/editor/plugins/resources/icons/findIconDisabled.gif
web/js/dojotoolkit/dojox/editor/plugins/resources/icons/findReplace.gif
web/js/dojotoolkit/dojox/editor/plugins/resources/icons/findReplaceDisabled.gif
web/js/dojotoolkit/dojox/editor/plugins/resources/icons/replaceIcon.gif
web/js/dojotoolkit/dojox/editor/plugins/resources/icons/replaceIconDisabled.gif
web/js/dojotoolkit/dojox/editor/plugins/resources/images/lucid/collapse.gif
web/js/dojotoolkit/dojox/editor/plugins/resources/images/lucid/expand.gif
--- a/.hgsigs	Thu Jul 29 16:10:28 2010 +0200
+++ b/.hgsigs	Mon Aug 02 08:18:10 2010 +0200
@@ -20,3 +20,4 @@
 9f343a616b2f998c3867661467de5dd9daeb7112 0 iEYEABECAAYFAkvq7PIACgkQCX/oGf+2qkMcHQCg3eHGql848ExhA5oOgtqfjIE3toUAn0GiWHkItn3YxPFitn8+e0IfOEaj
 9b4bbe8362f54f7212653fddf5bd053183a7ffda 0 iEYEABECAAYFAkv8vDgACgkQCX/oGf+2qkPC3ACfURoh78/OY95XuFkAKNfaLQQzuCsAoNoNLdSqMVYuAJMAI2mimGZ5BXaw
 7fe932c5c015da84a972d6945dd0451366bbf325 0 iEYEABECAAYFAkwodmcACgkQCX/oGf+2qkM4jQCgq2n4X0Tzi8EcGqNLhtzjOJ/1YcgAn3Fh9aZRpXmM2zYmMwuecn4UR5tt
+618363224a381737439e0bd4461e2d36c4fd986e 0 iEYEABECAAYFAkxFkHoACgkQCX/oGf+2qkP7DQCeK9qCv3jETpO5iM89PV2bJYmpErMAoO/H2QyeKKZjublcgFmH7g1tEomB
--- a/.hgtags	Thu Jul 29 16:10:28 2010 +0200
+++ b/.hgtags	Mon Aug 02 08:18:10 2010 +0200
@@ -30,3 +30,4 @@
 41915c2f5ec639dadab8e797a1e5f1e0922fa029 2.50MP17
 f7b9678ebb10f1fb0963b7e3cc4724aa6aeca565 2.50MP18
 34eed7b386965b19e191fbfe03195588cdc75254 2.50MP19
+99ff33f6588973f7e738b6afd47ad44f3ac08d20 2.50MP20
--- a/CONTRIBUTORS	Thu Jul 29 16:10:28 2010 +0200
+++ b/CONTRIBUTORS	Mon Aug 02 08:18:10 2010 +0200
@@ -7,3 +7,4 @@
 Ben Sommerville <ben.sommerville@eintel.com.au> - Bug fixing
 Ville Lindfors <ville.lindfors@bonware.com> - Code clean up
 Miroslav Lazarevic <lazarevic.miroslav@gmail.com> - Fixes to the build system
+Valery Lezhebokov <valery.lezhebokov@gmail.com> - Bug fixing
--- a/build.xml	Thu Jul 29 16:10:28 2010 +0200
+++ b/build.xml	Mon Aug 02 08:18:10 2010 +0200
@@ -100,6 +100,7 @@
   <property name="stopOnWadError" value="false"/>
   <property name="friendlyWarnings" value="false"/>
   <property name="checkTranslationConsistency" value="true"/>
+  <property name="buildValidation" value="true"/>
 
   <available file=".hg" property="is.hg" />
 
@@ -177,6 +178,13 @@
     </or>
   </condition>
 
+  <condition property="allow.root.user" value="true" else="false">
+    <or>
+      <equals arg1="yes" arg2="${allow.root}" />
+      <equals arg1="true" arg2="${allow.root}" />
+    </or>
+  </condition>
+
   <condition property="no.java.home" value="true">
     <not>
       <isset property="env.JAVA_HOME" />
@@ -188,7 +196,17 @@
       <equals arg1="${bbdd.rdbms}" arg2="POSTGRE" />
     </and>
   </condition>
- 
+
+  <condition property="root.user">
+    <and>
+      <equals arg1="${user.name}" arg2="root" />
+      <not>
+        <contains string="${os.name}" substring="Windows" />
+      </not>
+      <equals arg1="false" arg2="${allow.root.user}" />
+    </and>
+  </condition>
+
   <path id="project.class.path">
     <dirset dir="${base.modules}">
       <include name="*/build/classes/" />
@@ -298,6 +316,7 @@
   
   <target name="init" depends="code.rev">
     <fail if="no.java.home" message="The environment variable JAVA_HOME is not set." />
+    <fail if="root.user" message="Don't run ant tasks with the root user" />
   </target>
 
   <target name="code.rev" depends="set.code.rev">
@@ -389,6 +408,9 @@
 
   <target name="buildvalidation" depends="init, core.lib">
     <updatesystemstatus v="RB11"/> 
+    <condition property="buildValidation.var">
+      <istrue value="${buildValidation}"  />
+    </condition>
     <ant dir="src-util/buildvalidation" target="buildvalidation" inheritAll="true" inheritRefs="true" />
   </target>
   
@@ -927,6 +949,7 @@
         <equals arg1="${os.arch}" arg2="x86" />
         <equals arg1="${os.arch}" arg2="i386" />
         <contains string="${os.name}" substring="Windows" />
+        <contains string="${os.name}" substring="OS X" />
       </or>
     </condition>
     <condition property="osarch" value="-x64">
@@ -936,6 +959,9 @@
         <not>
           <contains string="${os.name}" substring="Windows" />
         </not>
+        <not>
+          <contains string="${os.name}" substring="OS X" />
+        </not>
       </or>
     </condition>
     <condition property="osarch" value="-ia64">
@@ -950,10 +976,20 @@
   </target>
 
   <target name="setup.exists.test">
-    <condition property="bin.ext" value="exe" else="bin">
+    <condition property="bin.ext" value="exe">
       <os family="windows" />
     </condition>
 
+    <condition property="bin.ext" value="app.tar.gz">
+      <os family="mac" />
+    </condition>
+
+    <condition property="bin.ext" value="bin">
+      <not>
+        <isset property="${bin.ext}" />
+      </not>
+    </condition>
+
     <available file="config/setup-properties-${osname}${osarch}.${bin.ext}" property="setup.exists" value="true" />
   </target>
 
--- a/config/Openbravo.properties.template	Thu Jul 29 16:10:28 2010 +0200
+++ b/config/Openbravo.properties.template	Mon Aug 02 08:18:10 2010 +0200
@@ -175,3 +175,11 @@
 login.trial.delay.increment=0
 login.trial.delay.max=0
 login.trial.user.lock=0
+
+##########
+# Others #
+##########
+
+# You are not allowed to run ant commands with the root user.
+# Set allow.root to true to override this.
+allow.root=false
--- a/referencedata/standard/Initial_Setup.xml	Thu Jul 29 16:10:28 2010 +0200
+++ b/referencedata/standard/Initial_Setup.xml	Mon Aug 02 08:18:10 2010 +0200
@@ -9,15 +9,6 @@
     <default>true</default>
     <language id="192" entity-name="ADLanguage" identifier="English (USA)"/>
   </EmailTemplate>
-  <EmailTemplate id="878ECF0D5A268C7BE040007F010129BA" identifier="AR Invoice Indirect Report template - ">
-    <id>878ECF0D5A268C7BE040007F010129BA</id>
-    <active>true</active>
-    <pocDocumentType id="29F7240568EC43E583E157911773C3A5" entity-name="DocumentTemplate" identifier="AR Invoice Indirect Report template"/>
-    <subject xsi:nil="true"/>
-    <body xsi:nil="true"/>
-    <default>true</default>
-    <language id="192" entity-name="ADLanguage" identifier="English (USA)"/>
-  </EmailTemplate>
   <EmailTemplate id="878ECF0D5A298C7BE040007F010129BA" identifier="AR Credit Memo Report template - ">
     <id>878ECF0D5A298C7BE040007F010129BA</id>
     <active>true</active>
@@ -557,7 +548,7 @@
     <salesTransaction>true</salesTransaction>
     <sOSubType>WR</sOSubType>
     <documentTypeForShipment id="F8CC92C7234644DEAD9F63174F45B2BF" entity-name="DocumentType" identifier="MM Shipment Indirect"/>
-    <documentTypeForInvoice id="B896128A9164438A9B85CC8821FC7162" entity-name="DocumentType" identifier="AR Invoice Indirect"/>
+    <documentTypeForInvoice id="40EE9B1CD3B345FABEFDA62B407B407F" entity-name="DocumentType" identifier="AR Invoice Indirect"/>
     <sequencedDocument>true</sequencedDocument>
     <documentSequence id="FFB42B38D6A34634B534AB499B13644C" entity-name="ADSequence" identifier="POS Order"/>
     <gLCategory id="745A2B441A2644DF934D1B1E462292E9" entity-name="FinancialMgmtGLCategory" identifier="None"/>
@@ -855,28 +846,6 @@
     <documentCancelled xsi:nil="true"/>
     <expense>false</expense>
   </DocumentType>
-  <DocumentType id="B896128A9164438A9B85CC8821FC7162" identifier="AR Invoice Indirect">
-    <id>B896128A9164438A9B85CC8821FC7162</id>
-    <active>true</active>
-    <name>AR Invoice Indirect</name>
-    <printText>Invoice Indirect.</printText>
-    <description xsi:nil="true"/>
-    <documentCategory>ARI</documentCategory>
-    <salesTransaction>true</salesTransaction>
-    <sOSubType xsi:nil="true"/>
-    <documentTypeForShipment id="0" entity-name="DocumentType" identifier="** New **"/>
-    <documentTypeForInvoice id="0" entity-name="DocumentType" identifier="** New **"/>
-    <sequencedDocument>true</sequencedDocument>
-    <documentSequence id="4ED4DE47C4F44E578747E0FA81E29885" entity-name="ADSequence" identifier="AR Invoice Indirect"/>
-    <gLCategory id="102C08DF5D4341D5B7FDF758632503D2" entity-name="FinancialMgmtGLCategory" identifier="AR Invoice"/>
-    <comments xsi:nil="true"/>
-    <default>false</default>
-    <numberOfCopies>0</numberOfCopies>
-    <table id="318" entity-name="ADTable" identifier="C_Invoice"/>
-    <filterByOrganization>false</filterByOrganization>
-    <documentCancelled xsi:nil="true"/>
-    <expense>false</expense>
-  </DocumentType>
   <DocumentType id="B968C737ED3E4C808E425A72CC445DFE" identifier="Manual Settlement">
     <id>B968C737ED3E4C808E425A72CC445DFE</id>
     <active>true</active>
@@ -1111,22 +1080,6 @@
     <suffix xsi:nil="true"/>
     <restartSequenceEveryYear>false</restartSequenceEveryYear>
   </ADSequence>
-  <ADSequence id="4ED4DE47C4F44E578747E0FA81E29885" identifier="AR Invoice Indirect">
-    <id>4ED4DE47C4F44E578747E0FA81E29885</id>
-    <active>true</active>
-    <name>AR Invoice Indirect</name>
-    <description xsi:nil="true"/>
-    <valueFormat xsi:nil="true"/>
-    <autoNumbering>true</autoNumbering>
-    <incrementBy>1</incrementBy>
-    <startingNo>200000</startingNo>
-    <nextAssignedNumber>200000</nextAssignedNumber>
-    <currentNextSystem>20000</currentNextSystem>
-    <usedForRecordID>false</usedForRecordID>
-    <prefix xsi:nil="true"/>
-    <suffix xsi:nil="true"/>
-    <restartSequenceEveryYear>false</restartSequenceEveryYear>
-  </ADSequence>
   <ADSequence id="6D3C7477332F47CD8A0F6A5C4805EBD4" identifier="Prepay Order">
     <id>6D3C7477332F47CD8A0F6A5C4805EBD4</id>
     <active>true</active>
@@ -1513,15 +1466,6 @@
     <reportFilename>Sales Order-@our_ref@</reportFilename>
     <templateFilename>C_OrderJR.jrxml</templateFilename>
   </DocumentTemplate>
-  <DocumentTemplate id="29F7240568EC43E583E157911773C3A5" identifier="AR Invoice Indirect Report template">
-    <name>AR Invoice Indirect Report template</name>
-    <id>29F7240568EC43E583E157911773C3A5</id>
-    <active>true</active>
-    <documentType id="B896128A9164438A9B85CC8821FC7162" entity-name="DocumentType" identifier="AR Invoice Indirect"/>
-    <templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
-    <reportFilename>Sales Invoice-@our_ref@</reportFilename>
-    <templateFilename>RptC_Invoice.jrxml</templateFilename>
-  </DocumentTemplate>
   <DocumentTemplate id="4F23CD7CD64D468EA4753C0C7B09FD53" identifier="Return Material Report template">
     <name>Return Material Report template</name>
     <id>4F23CD7CD64D468EA4753C0C7B09FD53</id>
Binary file src-db/database/lib/dbsourcemanager.jar has changed
--- a/src-db/database/model/functions/C_INVOICE_POST.xml	Thu Jul 29 16:10:28 2010 +0200
+++ b/src-db/database/model/functions/C_INVOICE_POST.xml	Mon Aug 02 08:18:10 2010 +0200
@@ -1560,6 +1560,7 @@
                 AND C_SETTLEMENT_GENERATE_ID IS NOT NULL
                 AND Ad_Isorgincluded(v_Org_id, dp.ad_org_id,v_Client_ID) != -1
                 AND ad_client_id = v_Client_ID
+                AND C_INVOICE_ID=v_Record_ID
                 AND EXISTS (SELECT 1
                             FROM C_SETTLEMENT S
                             WHERE DP.C_SETTLEMENT_GENERATE_ID = S.C_Settlement_ID
--- a/src-db/database/model/functions/C_REMITTANCE_POST.xml	Thu Jul 29 16:10:28 2010 +0200
+++ b/src-db/database/model/functions/C_REMITTANCE_POST.xml	Mon Aug 02 08:18:10 2010 +0200
@@ -78,7 +78,7 @@
     v_DPId varchar2(32);
     v_DPMLineId varchar2(32);
     v_GeneratedAmt NUMBER;
-    v_PaymetRule VARCHAR2(2) ;
+    v_PaymetRule VARCHAR2(60) ;
     v_IsReceipt CHAR(1) ;
     v_BankPartner varchar2(32);
     v_vSettlementId varchar2(32);
--- a/src-db/database/model/functions/FACT_ACCT_RESET.xml	Thu Jul 29 16:10:28 2010 +0200
+++ b/src-db/database/model/functions/FACT_ACCT_RESET.xml	Mon Aug 02 08:18:10 2010 +0200
@@ -41,6 +41,7 @@
   v_DateColumn VARCHAR2(2000):='';
   v_AD_Org_ID VARCHAR2(32);
   v_TableName VARCHAR2(48):='';
+  v_AD_Org_CalOwner VARCHAR(32);
   -- Parameter
   TYPE RECORD IS REF CURSOR;
     Cur_Parameter RECORD;
@@ -207,6 +208,7 @@
           -- Update Table
           v_ResultStr:='ResetTable:' || Cur_Tables.TableName;
            IF(v_DeletePosting='Y') THEN
+            v_AD_Org_CalOwner := AD_ORG_GETCALENDAROWNER(v_AD_Org_ID);
             FOR Cur_Fact_Acct IN (
               SELECT DISTINCT Record_ID
               FROM FACT_ACCT
@@ -226,7 +228,7 @@
                       AND fa_aux.AD_TABLE_ID = FACT_ACCT.AD_TABLE_ID
                       AND fa_aux.RECORD_ID = FACT_ACCT.RECORD_ID
                       AND C_PeriodControl.AD_Org_ID=AD_Org.AD_Org_ID
-                      AND C_PeriodControl.AD_Org_ID=AD_ORG_GETCALENDAROWNER(v_AD_Org_ID)
+                      AND C_PeriodControl.AD_Org_ID=v_AD_Org_CalOwner
                     )
                 AND Record_ID=(
                       CASE COALESCE(v_Record_ID, '0') WHEN '0' THEN Record_ID ELSE v_Record_ID
--- a/src-db/database/model/functions/MRP_PURCHASEPLAN.xml	Thu Jul 29 16:10:28 2010 +0200
+++ b/src-db/database/model/functions/MRP_PURCHASEPLAN.xml	Mon Aug 02 08:18:10 2010 +0200
@@ -72,7 +72,7 @@
     v_ResultStr := 'Purchase mrp';
 
     FOR Cur_PlanProduct IN (
-        SELECT MRP_RUN_PURCHASELINE.M_PRODUCT_ID,
+        SELECT MRP_RUN_PURCHASELINE.M_PRODUCT_ID, M_PRODUCT.NAME AS PRODUCTNAME,
           COALESCE(M_PRODUCT_PO.CAPACITY, M_PRODUCT_ORG.CAPACITY, M_PRODUCT.CAPACITY) AS CAPACITY,
           COALESCE(M_PRODUCT_PO.DELIVERYTIME_PROMISED, M_PRODUCT_ORG.DELAYMIN, M_PRODUCT.DELAYMIN, 0) AS DELAYMIN,
           COALESCE(M_PRODUCT_PO.QTYTYPE, M_PRODUCT_ORG.QTYTYPE, M_PRODUCT_ORG.QTYTYPE, 'E') AS qtytype,
@@ -93,7 +93,7 @@
           AND PRODUCT_PO.C_BPARTNER_ID = M_PRODUCT_PO.C_BPARTNER_ID
           AND PRODUCT_PO.M_PRODUCT_ID = M_PRODUCT_PO.M_PRODUCT_ID
           AND M_PRODUCT.ISPURCHASED = 'Y'
-      GROUP BY MRP_RUN_PURCHASELINE.M_PRODUCT_ID, M_PRODUCT_PO.CAPACITY, M_PRODUCT_ORG.CAPACITY, M_PRODUCT.CAPACITY,
+      GROUP BY MRP_RUN_PURCHASELINE.M_PRODUCT_ID, M_PRODUCT.NAME, M_PRODUCT_PO.CAPACITY, M_PRODUCT_ORG.CAPACITY, M_PRODUCT.CAPACITY,
         M_PRODUCT_PO.DELIVERYTIME_PROMISED, M_PRODUCT_ORG.DELAYMIN, M_PRODUCT.DELAYMIN,
         M_PRODUCT_PO.QTYTYPE, M_PRODUCT_ORG.QTYTYPE, M_PRODUCT_ORG.QTYTYPE,
         M_PRODUCT_PO.ORDER_MIN, M_PRODUCT_ORG.QTYMIN, M_PRODUCT_ORG.QTYMIN,
@@ -133,6 +133,10 @@
               v_Qty_new := CEIL(v_qty_new/Cur_PlanProduct.qtystd)*Cur_PlanProduct.qtystd;
             END IF;
 
+            IF (Cur_PlanProduct.CAPACITY = 0) THEN
+		RAISE_APPLICATION_ERROR(-20000, '@CapacityZero@ ' || Cur_PlanProduct.PRODUCTNAME);
+            END IF;
+
             v_plannedorderdate_new := TRUNC(v_planneddate_new -
                                       GREATEST(Cur_PlanProduct.DELAYMIN, (CASE WHEN Cur_PlanProduct.CAPACITY IS NULL THEN 0
                                                                   ELSE CEIL(v_Qty_new/Cur_PlanProduct.CAPACITY)
@@ -148,6 +152,10 @@
               v_Qty_new := CEIL(v_qty_new/Cur_PlanProduct.qtystd)*Cur_PlanProduct.qtystd;
             END IF;
 
+            IF (Cur_PlanProduct.CAPACITY = 0) THEN
+		RAISE_APPLICATION_ERROR(-20000, '@CapacityZero@ ' || Cur_PlanProduct.PRODUCTNAME);
+            END IF;
+
             v_plannedorderdate_new := TRUNC(v_planneddate_old -
                                       GREATEST(Cur_PlanProduct.DELAYMIN, (CASE WHEN Cur_PlanProduct.CAPACITY IS NULL THEN 0
                                                                   ELSE CEIL(v_Qty_new/Cur_PlanProduct.CAPACITY)
--- a/src-db/database/model/tables/C_PERIODCONTROL.xml	Thu Jul 29 16:10:28 2010 +0200
+++ b/src-db/database/model/tables/C_PERIODCONTROL.xml	Mon Aug 02 08:18:10 2010 +0200
@@ -62,6 +62,9 @@
       <foreign-key foreignTable="AD_ORG" name="C_PERIODCONTROL_AD_ORG">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <index name="C_PERIODCONTROL_PERIOD" unique="false">
+        <index-column name="C_PERIOD_ID"/>
+      </index>
       <check name="C_PERIODCONTROL_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/src-db/database/model/tables/C_POC_DOCTYPE_TEMPLATE.xml	Thu Jul 29 16:10:28 2010 +0200
+++ b/src-db/database/model/tables/C_POC_DOCTYPE_TEMPLATE.xml	Mon Aug 02 08:18:10 2010 +0200
@@ -53,6 +53,18 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="SHOWCOMPANYDATA" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="SHOWLOGO" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="HEADERMARGIN" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="C_POC_DOCTYPE_TEMPLATE_AD_CLIE">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
@@ -65,5 +77,7 @@
       <index name="C_POC_DOCTYPE_TEMP_DOCTYPE_IDX" unique="false">
         <index-column name="C_DOCTYPE_ID"/>
       </index>
+      <check name="C_POC_DOCTYPETEMP_SHOWCOMP_CHK"><![CDATA[SHOWCOMPANYDATA IN ('Y', 'N')]]></check>
+      <check name="C_POC_DOCTYPETEMP_SHOWLOGO_CHK"><![CDATA[SHOWLOGO IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/src-db/database/model/tables/FIN_FINACC_PAYMENTMETHOD.xml	Thu Jul 29 16:10:28 2010 +0200
+++ b/src-db/database/model/tables/FIN_FINACC_PAYMENTMETHOD.xml	Mon Aug 02 08:18:10 2010 +0200
@@ -131,10 +131,10 @@
       <foreign-key foreignTable="FIN_PAY_EXEC_PROCESS" name="FIN_FINACCMETH_PAYOUTEXECPROC">
         <reference local="PAYOUT_EXECUTION_PROCESS_ID" foreign="FIN_PAY_EXEC_PROCESS_ID"/>
       </foreign-key>
-      <index name="FIN_FINACC_PAYMETHOD_UNIQUEKEY" unique="true">
-        <index-column name="FIN_PAYMENTMETHOD_ID"/>
-        <index-column name="FIN_FINANCIAL_ACCOUNT_ID"/>
-      </index>
+      <unique name="FIN_FINACC_PAYMENTMETHOD_UN">
+        <unique-column name="FIN_PAYMENTMETHOD_ID"/>
+        <unique-column name="FIN_FINANCIAL_ACCOUNT_ID"/>
+      </unique>
       <check name="FIN_FINACC_METHOD_ACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="FIN_FINACC_METHOD_DEPOSIT_CHK"><![CDATA[AUTOMATIC_DEPOSIT IN ('Y', 'N')]]></check>
       <check name="FIN_FINACC_METHOD_PAYMENT_CHK"><![CDATA[AUTOMATIC_PAYMENT IN ('Y', 'N')]]></check>
--- a/src-db/database/model/triggers/AD_DATASET_COLUMN_MOD_TRG.xml	Thu Jul 29 16:10:28 2010 +0200
+++ b/src-db/database/model/triggers/AD_DATASET_COLUMN_MOD_TRG.xml	Mon Aug 02 08:18:10 2010 +0200
@@ -15,13 +15,12 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2008-2009 Openbravo SLU
+* All portions are Copyright (C) 2008-2010 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  cuerrentID  VARCHAR2(32);
   cuerrentModuleID  VARCHAR2(32);
   vAux NUMBER;
     
@@ -51,19 +50,15 @@
      AND Type = 'T';
      
   IF (UPDATING OR INSERTING) THEN
-    cuerrentID := :new.AD_Dataset_Column_ID;
-    cuerrentModuleID := :new.AD_Dataset_Table_ID;
+    cuerrentModuleID := :new.AD_Module_ID;
   ELSE
-    cuerrentID := :old.AD_Dataset_Column_ID;
-    cuerrentModuleID := :old.AD_Dataset_Table_ID;
+    cuerrentModuleID := :old.AD_Module_ID;
   END IF;
   
-   SELECT M.IsInDevelopment
+  SELECT M.IsInDevelopment
     INTO devModule
-    FROM AD_MODULE M, AD_DATASET T, AD_DATASET_TABLE T1
-   WHERE M.AD_MODULE_ID = T.AD_MODULE_ID
-     AND T1.AD_DATASET_ID = T.AD_DATASET_ID
-     AND T1.AD_DATASET_TABLE_ID = cuerrentModuleID;
+    FROM AD_MODULE M
+   WHERE M.AD_MODULE_ID = cuerrentModuleID;
      
   IF (UPDATING AND devTemplate=0 AND devModule='N') THEN
     IF (
--- a/src-db/database/model/triggers/AD_DATASET_TABLE_MOD_TRG.xml	Thu Jul 29 16:10:28 2010 +0200
+++ b/src-db/database/model/triggers/AD_DATASET_TABLE_MOD_TRG.xml	Mon Aug 02 08:18:10 2010 +0200
@@ -15,13 +15,12 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2008-2009 Openbravo SLU
+* All portions are Copyright (C) 2008-2010 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  cuerrentID  VARCHAR2(32);
   cuerrentModuleID  VARCHAR2(32);
   vAux NUMBER;
     
@@ -51,19 +50,15 @@
      AND Type = 'T';
      
   IF (UPDATING OR INSERTING) THEN
-    cuerrentID := :new.AD_Dataset_Table_ID;
-    cuerrentModuleID := :new.AD_Dataset_ID;
+    cuerrentModuleID := :new.AD_Module_ID;
   ELSE
-    cuerrentID := :old.AD_Dataset_Table_ID;
-    cuerrentModuleID := :old.AD_Dataset_ID;
+    cuerrentModuleID := :old.AD_Module_ID;
   END IF;
   
   SELECT M.IsInDevelopment
     INTO devModule
-    FROM AD_MODULE M, AD_DATASET T
-   WHERE M.AD_MODULE_ID = T.AD_MODULE_ID
-     AND T.AD_DATASET_ID = cuerrentModuleID;
-
+    FROM AD_MODULE M
+   WHERE M.AD_MODULE_ID = cuerrentModuleID;
      
   IF (UPDATING AND devTemplate=0 AND devModule='N') THEN
     IF (
--- a/src-db/database/model/triggers/AD_MODULE_VERSION_TRG.xml	Thu Jul 29 16:10:28 2010 +0200
+++ b/src-db/database/model/triggers/AD_MODULE_VERSION_TRG.xml	Mon Aug 02 08:18:10 2010 +0200
@@ -17,8 +17,10 @@
 * The Initial Developer of the Original Code is Openbravo SLU
 * All portions are Copyright (C) 2009-2010 Openbravo SLU
 * All Rights Reserved.
-* Contributor(s):  ______________________________________.
+* Contributor(s):  Valery Lezhebokov.
 ************************************************************************/
+  number_pattern CONSTANT CHAR(10):= '0123456789';
+  
   v1 VARCHAR(10);
   v2 VARCHAR(10);
   v3 VARCHAR(10);
@@ -42,8 +44,10 @@
     v2 := SUBSTR(:new.VERSION,instr(:new.VERSION,'.')+1,instr(:new.VERSION,'.',1,2)-instr(:new.VERSION,'.')-1);
     v3 := SUBSTR(:new.VERSION,instr(:new.VERSION,'.',1,2)+1);
     
-    IF TRIM(TRANSLATE(v1, '0123456789','')) <> '' OR TRIM(TRANSLATE(v2, '0123456789','')) <> '' OR TRIM(TRANSLATE(v3, '0123456789','')) <> '' THEN
-       RAISE_APPLICATION_ERROR(-20104, 'The version has to be formatted like x.y.z where x, y and z are integers.');
+    IF COALESCE(LENGTH(TRIM(TRANSLATE(v1, number_pattern, ' '))),0) <> 0 OR 
+       COALESCE(LENGTH(TRIM(TRANSLATE(v2, number_pattern, ' '))),0) <> 0 OR 
+       COALESCE(LENGTH(TRIM(TRANSLATE(v3, number_pattern, ' '))),0) <> 0 THEN
+            RAISE_APPLICATION_ERROR(-20104, 'The version has to be formatted like x.y.z where x, y and z are integers.');
     END IF;
 
 END AD_MODULE_VERSION_TRG
--- a/src-db/database/model/triggers/C_ORDERLINE_TRG2.xml	Thu Jul 29 16:10:28 2010 +0200
+++ b/src-db/database/model/triggers/C_ORDERLINE_TRG2.xml	Mon Aug 02 08:18:10 2010 +0200
@@ -184,7 +184,7 @@
      VALUES
          (v_OrderLine_Offer_ID, :NEW.AD_Client_ID, :NEW.AD_Org_ID, :NEW.IsActive,
         now(),:NEW.CreatedBy, now(),:NEW.UpdatedBy,
-       :NEW.C_OrderLine_ID, v_lineno, Cur_Offer.M_Offer_Id, ROUND(v_Price,v_Precision), ROUND(v_Amt,v_Precision));
+       :NEW.C_OrderLine_ID, v_lineno, Cur_Offer.M_Offer_Id, COALESCE(ROUND(v_Price,v_Precision),0), COALESCE(ROUND(v_Amt,v_Precision),0));
       v_Price := v_PriceNew;
    END IF;
   END LOOP;
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Thu Jul 29 16:10:28 2010 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Mon Aug 02 08:18:10 2010 +0200
@@ -67812,7 +67812,7 @@
 <!--4019-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--4019-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--4019-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--4019-->  <READONLYLOGIC><![CDATA[@OrderType@='WP' | @Processed@='Y']]></READONLYLOGIC>
+<!--4019-->  <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC>
 <!--4019-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--4019-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--4019-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -251459,7 +251459,7 @@
 <!--1000500025-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--1000500025-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--1000500025-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1000500025-->  <POSITION><![CDATA[10]]></POSITION>
+<!--1000500025-->  <POSITION><![CDATA[11]]></POSITION>
 <!--1000500025-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--1000500025-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--1000500025-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -251492,7 +251492,7 @@
 <!--1000500026-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--1000500026-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--1000500026-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1000500026-->  <POSITION><![CDATA[11]]></POSITION>
+<!--1000500026-->  <POSITION><![CDATA[12]]></POSITION>
 <!--1000500026-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--1000500026-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--1000500026-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -251525,7 +251525,7 @@
 <!--1000500027-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--1000500027-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--1000500027-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1000500027-->  <POSITION><![CDATA[12]]></POSITION>
+<!--1000500027-->  <POSITION><![CDATA[13]]></POSITION>
 <!--1000500027-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--1000500027-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--1000500027-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -263142,7 +263142,7 @@
 <!--04FBAB822CB84530874871E0CB7836E6-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--04FBAB822CB84530874871E0CB7836E6-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--04FBAB822CB84530874871E0CB7836E6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--04FBAB822CB84530874871E0CB7836E6-->  <POSITION><![CDATA[0]]></POSITION>
+<!--04FBAB822CB84530874871E0CB7836E6-->  <POSITION><![CDATA[10]]></POSITION>
 <!--04FBAB822CB84530874871E0CB7836E6-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--04FBAB822CB84530874871E0CB7836E6-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--04FBAB822CB84530874871E0CB7836E6-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -263411,6 +263411,38 @@
 <!--0CC9E53ACEFA4F678C718071C423E931-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
 <!--0CC9E53ACEFA4F678C718071C423E931--></AD_COLUMN>
 
+<!--0CDFD29152EC421497CD67DCB47540B5--><AD_COLUMN>
+<!--0CDFD29152EC421497CD67DCB47540B5-->  <AD_COLUMN_ID><![CDATA[0CDFD29152EC421497CD67DCB47540B5]]></AD_COLUMN_ID>
+<!--0CDFD29152EC421497CD67DCB47540B5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0CDFD29152EC421497CD67DCB47540B5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0CDFD29152EC421497CD67DCB47540B5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0CDFD29152EC421497CD67DCB47540B5-->  <NAME><![CDATA[Showlogo]]></NAME>
+<!--0CDFD29152EC421497CD67DCB47540B5-->  <COLUMNNAME><![CDATA[Showlogo]]></COLUMNNAME>
+<!--0CDFD29152EC421497CD67DCB47540B5-->  <AD_TABLE_ID><![CDATA[1000500001]]></AD_TABLE_ID>
+<!--0CDFD29152EC421497CD67DCB47540B5-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--0CDFD29152EC421497CD67DCB47540B5-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--0CDFD29152EC421497CD67DCB47540B5-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--0CDFD29152EC421497CD67DCB47540B5-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--0CDFD29152EC421497CD67DCB47540B5-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--0CDFD29152EC421497CD67DCB47540B5-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--0CDFD29152EC421497CD67DCB47540B5-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--0CDFD29152EC421497CD67DCB47540B5-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--0CDFD29152EC421497CD67DCB47540B5-->  <SEQNO><![CDATA[150]]></SEQNO>
+<!--0CDFD29152EC421497CD67DCB47540B5-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--0CDFD29152EC421497CD67DCB47540B5-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--0CDFD29152EC421497CD67DCB47540B5-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--0CDFD29152EC421497CD67DCB47540B5-->  <AD_ELEMENT_ID><![CDATA[F668C2865A2F462BBFE89754F2B06274]]></AD_ELEMENT_ID>
+<!--0CDFD29152EC421497CD67DCB47540B5-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--0CDFD29152EC421497CD67DCB47540B5-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--0CDFD29152EC421497CD67DCB47540B5-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--0CDFD29152EC421497CD67DCB47540B5-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--0CDFD29152EC421497CD67DCB47540B5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--0CDFD29152EC421497CD67DCB47540B5-->  <POSITION><![CDATA[15]]></POSITION>
+<!--0CDFD29152EC421497CD67DCB47540B5-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--0CDFD29152EC421497CD67DCB47540B5-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--0CDFD29152EC421497CD67DCB47540B5-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--0CDFD29152EC421497CD67DCB47540B5--></AD_COLUMN>
+
 <!--0E6D266DCF4E426CB56909D792732DA9--><AD_COLUMN>
 <!--0E6D266DCF4E426CB56909D792732DA9-->  <AD_COLUMN_ID><![CDATA[0E6D266DCF4E426CB56909D792732DA9]]></AD_COLUMN_ID>
 <!--0E6D266DCF4E426CB56909D792732DA9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -263599,7 +263631,7 @@
 <!--112E72136642484B95A9CD0EB79ED7F3-->  <SEQNO><![CDATA[110]]></SEQNO>
 <!--112E72136642484B95A9CD0EB79ED7F3-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--112E72136642484B95A9CD0EB79ED7F3-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--112E72136642484B95A9CD0EB79ED7F3-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--112E72136642484B95A9CD0EB79ED7F3-->  <ISSELECTIONCOLUMN><![CDATA[Y]]></ISSELECTIONCOLUMN>
 <!--112E72136642484B95A9CD0EB79ED7F3-->  <AD_ELEMENT_ID><![CDATA[187]]></AD_ELEMENT_ID>
 <!--112E72136642484B95A9CD0EB79ED7F3-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--112E72136642484B95A9CD0EB79ED7F3-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
@@ -264814,7 +264846,7 @@
 <!--1EAEE8AF503C4348B565DB81325665D2-->  <SEQNO><![CDATA[150]]></SEQNO>
 <!--1EAEE8AF503C4348B565DB81325665D2-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--1EAEE8AF503C4348B565DB81325665D2-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1EAEE8AF503C4348B565DB81325665D2-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--1EAEE8AF503C4348B565DB81325665D2-->  <ISSELECTIONCOLUMN><![CDATA[Y]]></ISSELECTIONCOLUMN>
 <!--1EAEE8AF503C4348B565DB81325665D2-->  <AD_ELEMENT_ID><![CDATA[7890366979712CEFE040007F01013334]]></AD_ELEMENT_ID>
 <!--1EAEE8AF503C4348B565DB81325665D2-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--1EAEE8AF503C4348B565DB81325665D2-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
@@ -291991,7 +292023,7 @@
 <!--7DC34559B410B45BE040007F0100784A-->  <SEQNO><![CDATA[250]]></SEQNO>
 <!--7DC34559B410B45BE040007F0100784A-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--7DC34559B410B45BE040007F0100784A-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--7DC34559B410B45BE040007F0100784A-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7DC34559B410B45BE040007F0100784A-->  <ISSELECTIONCOLUMN><![CDATA[Y]]></ISSELECTIONCOLUMN>
 <!--7DC34559B410B45BE040007F0100784A-->  <AD_ELEMENT_ID><![CDATA[7DC34559B411B45BE040007F0100784A]]></AD_ELEMENT_ID>
 <!--7DC34559B410B45BE040007F0100784A-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--7DC34559B410B45BE040007F0100784A-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
@@ -305460,7 +305492,7 @@
 <!--8B042E0FE87E44F68B30A31E67C1E158-->  <SEQNO><![CDATA[120]]></SEQNO>
 <!--8B042E0FE87E44F68B30A31E67C1E158-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--8B042E0FE87E44F68B30A31E67C1E158-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--8B042E0FE87E44F68B30A31E67C1E158-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--8B042E0FE87E44F68B30A31E67C1E158-->  <ISSELECTIONCOLUMN><![CDATA[Y]]></ISSELECTIONCOLUMN>
 <!--8B042E0FE87E44F68B30A31E67C1E158-->  <AD_ELEMENT_ID><![CDATA[7891269C840C655DE040007F010155CE]]></AD_ELEMENT_ID>
 <!--8B042E0FE87E44F68B30A31E67C1E158-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--8B042E0FE87E44F68B30A31E67C1E158-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
@@ -306793,6 +306825,38 @@
 <!--A299657C67C841EBB8E51AFB606EE4EF-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
 <!--A299657C67C841EBB8E51AFB606EE4EF--></AD_COLUMN>
 
+<!--A3C2472400314ABD9C0612B98D317523--><AD_COLUMN>
+<!--A3C2472400314ABD9C0612B98D317523-->  <AD_COLUMN_ID><![CDATA[A3C2472400314ABD9C0612B98D317523]]></AD_COLUMN_ID>
+<!--A3C2472400314ABD9C0612B98D317523-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A3C2472400314ABD9C0612B98D317523-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A3C2472400314ABD9C0612B98D317523-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A3C2472400314ABD9C0612B98D317523-->  <NAME><![CDATA[Headermargin]]></NAME>
+<!--A3C2472400314ABD9C0612B98D317523-->  <COLUMNNAME><![CDATA[Headermargin]]></COLUMNNAME>
+<!--A3C2472400314ABD9C0612B98D317523-->  <AD_TABLE_ID><![CDATA[1000500001]]></AD_TABLE_ID>
+<!--A3C2472400314ABD9C0612B98D317523-->  <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
+<!--A3C2472400314ABD9C0612B98D317523-->  <AD_REFERENCE_VALUE_ID><![CDATA[27A729423DEE4023B8B799377CB19D11]]></AD_REFERENCE_VALUE_ID>
+<!--A3C2472400314ABD9C0612B98D317523-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--A3C2472400314ABD9C0612B98D317523-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--A3C2472400314ABD9C0612B98D317523-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--A3C2472400314ABD9C0612B98D317523-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--A3C2472400314ABD9C0612B98D317523-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--A3C2472400314ABD9C0612B98D317523-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--A3C2472400314ABD9C0612B98D317523-->  <SEQNO><![CDATA[160]]></SEQNO>
+<!--A3C2472400314ABD9C0612B98D317523-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--A3C2472400314ABD9C0612B98D317523-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A3C2472400314ABD9C0612B98D317523-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--A3C2472400314ABD9C0612B98D317523-->  <AD_ELEMENT_ID><![CDATA[BFA91469430F42078C630B261DF37ECC]]></AD_ELEMENT_ID>
+<!--A3C2472400314ABD9C0612B98D317523-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--A3C2472400314ABD9C0612B98D317523-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--A3C2472400314ABD9C0612B98D317523-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--A3C2472400314ABD9C0612B98D317523-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--A3C2472400314ABD9C0612B98D317523-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--A3C2472400314ABD9C0612B98D317523-->  <POSITION><![CDATA[16]]></POSITION>
+<!--A3C2472400314ABD9C0612B98D317523-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--A3C2472400314ABD9C0612B98D317523-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--A3C2472400314ABD9C0612B98D317523-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--A3C2472400314ABD9C0612B98D317523--></AD_COLUMN>
+
 <!--A40F17F48EC444B2A1825C2E3D9AF7CE--><AD_COLUMN>
 <!--A40F17F48EC444B2A1825C2E3D9AF7CE-->  <AD_COLUMN_ID><![CDATA[A40F17F48EC444B2A1825C2E3D9AF7CE]]></AD_COLUMN_ID>
 <!--A40F17F48EC444B2A1825C2E3D9AF7CE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -307311,7 +307375,7 @@
 <!--AB42E56233264B32B435742B45F5B154-->  <SEQNO><![CDATA[180]]></SEQNO>
 <!--AB42E56233264B32B435742B45F5B154-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--AB42E56233264B32B435742B45F5B154-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--AB42E56233264B32B435742B45F5B154-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--AB42E56233264B32B435742B45F5B154-->  <ISSELECTIONCOLUMN><![CDATA[Y]]></ISSELECTIONCOLUMN>
 <!--AB42E56233264B32B435742B45F5B154-->  <AD_ELEMENT_ID><![CDATA[290]]></AD_ELEMENT_ID>
 <!--AB42E56233264B32B435742B45F5B154-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--AB42E56233264B32B435742B45F5B154-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
@@ -308481,6 +308545,38 @@
 <!--D651E163B279486F8F399DC05B63D426-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
 <!--D651E163B279486F8F399DC05B63D426--></AD_COLUMN>
 
+<!--D9DD2D28EC204CE7BC17C121276F7078--><AD_COLUMN>
+<!--D9DD2D28EC204CE7BC17C121276F7078-->  <AD_COLUMN_ID><![CDATA[D9DD2D28EC204CE7BC17C121276F7078]]></AD_COLUMN_ID>
+<!--D9DD2D28EC204CE7BC17C121276F7078-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D9DD2D28EC204CE7BC17C121276F7078-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D9DD2D28EC204CE7BC17C121276F7078-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D9DD2D28EC204CE7BC17C121276F7078-->  <NAME><![CDATA[Showcompanydata]]></NAME>
+<!--D9DD2D28EC204CE7BC17C121276F7078-->  <COLUMNNAME><![CDATA[Showcompanydata]]></COLUMNNAME>
+<!--D9DD2D28EC204CE7BC17C121276F7078-->  <AD_TABLE_ID><![CDATA[1000500001]]></AD_TABLE_ID>
+<!--D9DD2D28EC204CE7BC17C121276F7078-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--D9DD2D28EC204CE7BC17C121276F7078-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--D9DD2D28EC204CE7BC17C121276F7078-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--D9DD2D28EC204CE7BC17C121276F7078-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--D9DD2D28EC204CE7BC17C121276F7078-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--D9DD2D28EC204CE7BC17C121276F7078-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--D9DD2D28EC204CE7BC17C121276F7078-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--D9DD2D28EC204CE7BC17C121276F7078-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--D9DD2D28EC204CE7BC17C121276F7078-->  <SEQNO><![CDATA[140]]></SEQNO>
+<!--D9DD2D28EC204CE7BC17C121276F7078-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--D9DD2D28EC204CE7BC17C121276F7078-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D9DD2D28EC204CE7BC17C121276F7078-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--D9DD2D28EC204CE7BC17C121276F7078-->  <AD_ELEMENT_ID><![CDATA[3A29545A247A41CBB6ED3B5AA0CBF7CC]]></AD_ELEMENT_ID>
+<!--D9DD2D28EC204CE7BC17C121276F7078-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--D9DD2D28EC204CE7BC17C121276F7078-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--D9DD2D28EC204CE7BC17C121276F7078-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--D9DD2D28EC204CE7BC17C121276F7078-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--D9DD2D28EC204CE7BC17C121276F7078-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D9DD2D28EC204CE7BC17C121276F7078-->  <POSITION><![CDATA[14]]></POSITION>
+<!--D9DD2D28EC204CE7BC17C121276F7078-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--D9DD2D28EC204CE7BC17C121276F7078-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--D9DD2D28EC204CE7BC17C121276F7078-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--D9DD2D28EC204CE7BC17C121276F7078--></AD_COLUMN>
+
 <!--D9EAA088B59111DD97A00016D4EE9DB3--><AD_COLUMN>
 <!--D9EAA088B59111DD97A00016D4EE9DB3-->  <AD_COLUMN_ID><![CDATA[D9EAA088B59111DD97A00016D4EE9DB3]]></AD_COLUMN_ID>
 <!--D9EAA088B59111DD97A00016D4EE9DB3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -309165,7 +309261,7 @@
 <!--E9A4CCD256404FDDA9EDDC07F9FCAE4B-->  <SEQNO><![CDATA[130]]></SEQNO>
 <!--E9A4CCD256404FDDA9EDDC07F9FCAE4B-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--E9A4CCD256404FDDA9EDDC07F9FCAE4B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--E9A4CCD256404FDDA9EDDC07F9FCAE4B-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--E9A4CCD256404FDDA9EDDC07F9FCAE4B-->  <ISSELECTIONCOLUMN><![CDATA[Y]]></ISSELECTIONCOLUMN>
 <!--E9A4CCD256404FDDA9EDDC07F9FCAE4B-->  <AD_ELEMENT_ID><![CDATA[7891269C83E6655DE040007F010155CE]]></AD_ELEMENT_ID>
 <!--E9A4CCD256404FDDA9EDDC07F9FCAE4B-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--E9A4CCD256404FDDA9EDDC07F9FCAE4B-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
--- a/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Jul 29 16:10:28 2010 +0200
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml	Mon Aug 02 08:18:10 2010 +0200
@@ -22123,6 +22123,17 @@
 <!--361ED16139BD40CBA4DB049380EE1641-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--361ED16139BD40CBA4DB049380EE1641--></AD_ELEMENT>
 
+<!--3A29545A247A41CBB6ED3B5AA0CBF7CC--><AD_ELEMENT>
+<!--3A29545A247A41CBB6ED3B5AA0CBF7CC-->  <AD_ELEMENT_ID><![CDATA[3A29545A247A41CBB6ED3B5AA0CBF7CC]]></AD_ELEMENT_ID>
+<!--3A29545A247A41CBB6ED3B5AA0CBF7CC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3A29545A247A41CBB6ED3B5AA0CBF7CC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3A29545A247A41CBB6ED3B5AA0CBF7CC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3A29545A247A41CBB6ED3B5AA0CBF7CC-->  <COLUMNNAME><![CDATA[Showcompanydata]]></COLUMNNAME>
+<!--3A29545A247A41CBB6ED3B5AA0CBF7CC-->  <NAME><![CDATA[Show Company Data]]></NAME>
+<!--3A29545A247A41CBB6ED3B5AA0CBF7CC-->  <PRINTNAME><![CDATA[Show Company Data]]></PRINTNAME>
+<!--3A29545A247A41CBB6ED3B5AA0CBF7CC-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3A29545A247A41CBB6ED3B5AA0CBF7CC--></AD_ELEMENT>
+
 <!--3B584D993CCF41B698DBE642AFC21AE4--><AD_ELEMENT>
 <!--3B584D993CCF41B698DBE642AFC21AE4-->  <AD_ELEMENT_ID><![CDATA[3B584D993CCF41B698DBE642AFC21AE4]]></AD_ELEMENT_ID>
 <!--3B584D993CCF41B698DBE642AFC21AE4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -26971,6 +26982,17 @@
 <!--BEADA4ABFE544524B69FEC20E82F2D95-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--BEADA4ABFE544524B69FEC20E82F2D95--></AD_ELEMENT>
 
+<!--BFA91469430F42078C630B261DF37ECC--><AD_ELEMENT>
+<!--BFA91469430F42078C630B261DF37ECC-->  <AD_ELEMENT_ID><![CDATA[BFA91469430F42078C630B261DF37ECC]]></AD_ELEMENT_ID>
+<!--BFA91469430F42078C630B261DF37ECC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BFA91469430F42078C630B261DF37ECC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BFA91469430F42078C630B261DF37ECC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BFA91469430F42078C630B261DF37ECC-->  <COLUMNNAME><![CDATA[Headermargin]]></COLUMNNAME>
+<!--BFA91469430F42078C630B261DF37ECC-->  <NAME><![CDATA[Header Margin]]></NAME>
+<!--BFA91469430F42078C630B261DF37ECC-->  <PRINTNAME><![CDATA[Header Margin]]></PRINTNAME>
+<!--BFA91469430F42078C630B261DF37ECC-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--BFA91469430F42078C630B261DF37ECC--></AD_ELEMENT>
+
 <!--C0FEDDACE59D4AA59AFB2D1D65D748E0--><AD_ELEMENT>
 <!--C0FEDDACE59D4AA59AFB2D1D65D748E0-->  <AD_ELEMENT_ID><![CDATA[C0FEDDACE59D4AA59AFB2D1D65D748E0]]></AD_ELEMENT_ID>
 <!--C0FEDDACE59D4AA59AFB2D1D65D748E0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -27219,6 +27241,17 @@
 <!--F3BF680089754BAC858ECFF2D5D0F232-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--F3BF680089754BAC858ECFF2D5D0F232--></AD_ELEMENT>
 
+<!--F668C2865A2F462BBFE89754F2B06274--><AD_ELEMENT>
+<!--F668C2865A2F462BBFE89754F2B06274-->  <AD_ELEMENT_ID><![CDATA[F668C2865A2F462BBFE89754F2B06274]]></AD_ELEMENT_ID>
+<!--F668C2865A2F462BBFE89754F2B06274-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F668C2865A2F462BBFE89754F2B06274-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F668C2865A2F462BBFE89754F2B06274-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F668C2865A2F462BBFE89754F2B06274-->  <COLUMNNAME><![CDATA[Showlogo]]></COLUMNNAME>
+<!--F668C2865A2F462BBFE89754F2B06274-->  <NAME><![CDATA[Show Logo]]></NAME>
+<!--F668C2865A2F462BBFE89754F2B06274-->  <PRINTNAME><![CDATA[Show Logo]]></PRINTNAME>
+<!--F668C2865A2F462BBFE89754F2B06274-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F668C2865A2F462BBFE89754F2B06274--></AD_ELEMENT>
+
 <!--F6D57D6135DA4C4B9FF73062A73E020E--><AD_ELEMENT>
 <!--F6D57D6135DA4C4B9FF73062A73E020E-->  <AD_ELEMENT_ID><![CDATA[F6D57D6135DA4C4B9FF73062A73E020E]]></AD_ELEMENT_ID>
 <!--F6D57D6135DA4C4B9FF73062A73E020E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_FIELD.xml	Thu Jul 29 16:10:28 2010 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Mon Aug 02 08:18:10 2010 +0200
@@ -63415,7 +63415,7 @@
 <!--5324-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--5324-->  <AD_TAB_ID><![CDATA[316]]></AD_TAB_ID>
 <!--5324-->  <AD_COLUMN_ID><![CDATA[6650]]></AD_COLUMN_ID>
-<!--5324-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--5324-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
 <!--5324-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
 <!--5324-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--5324-->  <SEQNO><![CDATA[170]]></SEQNO>
@@ -181524,6 +181524,27 @@
 <!--090122697F994BE696E9F947FFF34E3C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--090122697F994BE696E9F947FFF34E3C--></AD_FIELD>
 
+<!--09E5D87D0BA14DF5B5BC6EF41D0E370C--><AD_FIELD>
+<!--09E5D87D0BA14DF5B5BC6EF41D0E370C-->  <AD_FIELD_ID><![CDATA[09E5D87D0BA14DF5B5BC6EF41D0E370C]]></AD_FIELD_ID>
+<!--09E5D87D0BA14DF5B5BC6EF41D0E370C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--09E5D87D0BA14DF5B5BC6EF41D0E370C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--09E5D87D0BA14DF5B5BC6EF41D0E370C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--09E5D87D0BA14DF5B5BC6EF41D0E370C-->  <NAME><![CDATA[Show Logo]]></NAME>
+<!--09E5D87D0BA14DF5B5BC6EF41D0E370C-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--09E5D87D0BA14DF5B5BC6EF41D0E370C-->  <AD_TAB_ID><![CDATA[1000500001]]></AD_TAB_ID>
+<!--09E5D87D0BA14DF5B5BC6EF41D0E370C-->  <AD_COLUMN_ID><![CDATA[0CDFD29152EC421497CD67DCB47540B5]]></AD_COLUMN_ID>
+<!--09E5D87D0BA14DF5B5BC6EF41D0E370C-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--09E5D87D0BA14DF5B5BC6EF41D0E370C-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--09E5D87D0BA14DF5B5BC6EF41D0E370C-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--09E5D87D0BA14DF5B5BC6EF41D0E370C-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--09E5D87D0BA14DF5B5BC6EF41D0E370C-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--09E5D87D0BA14DF5B5BC6EF41D0E370C-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--09E5D87D0BA14DF5B5BC6EF41D0E370C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--09E5D87D0BA14DF5B5BC6EF41D0E370C-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--09E5D87D0BA14DF5B5BC6EF41D0E370C-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--09E5D87D0BA14DF5B5BC6EF41D0E370C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--09E5D87D0BA14DF5B5BC6EF41D0E370C--></AD_FIELD>
+
 <!--0BF4F820661743B392304DC6FFA7317D--><AD_FIELD>
 <!--0BF4F820661743B392304DC6FFA7317D-->  <AD_FIELD_ID><![CDATA[0BF4F820661743B392304DC6FFA7317D]]></AD_FIELD_ID>
 <!--0BF4F820661743B392304DC6FFA7317D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -184051,6 +184072,27 @@
 <!--50FD7240D744436FB84543C30CB2625D-->  <GRID_SEQNO><![CDATA[110]]></GRID_SEQNO>
 <!--50FD7240D744436FB84543C30CB2625D--></AD_FIELD>
 
+<!--5117DE6A35174C0BAB235A37285526EB--><AD_FIELD>
+<!--5117DE6A35174C0BAB235A37285526EB-->  <AD_FIELD_ID><![CDATA[5117DE6A35174C0BAB235A37285526EB]]></AD_FIELD_ID>
+<!--5117DE6A35174C0BAB235A37285526EB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5117DE6A35174C0BAB235A37285526EB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5117DE6A35174C0BAB235A37285526EB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5117DE6A35174C0BAB235A37285526EB-->  <NAME><![CDATA[Header Margin]]></NAME>
+<!--5117DE6A35174C0BAB235A37285526EB-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--5117DE6A35174C0BAB235A37285526EB-->  <AD_TAB_ID><![CDATA[1000500001]]></AD_TAB_ID>
+<!--5117DE6A35174C0BAB235A37285526EB-->  <AD_COLUMN_ID><![CDATA[A3C2472400314ABD9C0612B98D317523]]></AD_COLUMN_ID>
+<!--5117DE6A35174C0BAB235A37285526EB-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--5117DE6A35174C0BAB235A37285526EB-->  <DISPLAYLENGTH><![CDATA[15]]></DISPLAYLENGTH>
+<!--5117DE6A35174C0BAB235A37285526EB-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--5117DE6A35174C0BAB235A37285526EB-->  <SEQNO><![CDATA[100]]></SEQNO>
+<!--5117DE6A35174C0BAB235A37285526EB-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--5117DE6A35174C0BAB235A37285526EB-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--5117DE6A35174C0BAB235A37285526EB-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--5117DE6A35174C0BAB235A37285526EB-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--5117DE6A35174C0BAB235A37285526EB-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--5117DE6A35174C0BAB235A37285526EB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--5117DE6A35174C0BAB235A37285526EB--></AD_FIELD>
+
 <!--51313EAEE1B140F582530EF98C436C90--><AD_FIELD>
 <!--51313EAEE1B140F582530EF98C436C90-->  <AD_FIELD_ID><![CDATA[51313EAEE1B140F582530EF98C436C90]]></AD_FIELD_ID>
 <!--51313EAEE1B140F582530EF98C436C90-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -202022,6 +202064,27 @@
 <!--A43A5D6E4A8F427A9B6B4D2EB73439F8-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--A43A5D6E4A8F427A9B6B4D2EB73439F8--></AD_FIELD>
 
+<!--A4C027AC88FE4C37BEA71C7E3C88B67D--><AD_FIELD>
+<!--A4C027AC88FE4C37BEA71C7E3C88B67D-->  <AD_FIELD_ID><![CDATA[A4C027AC88FE4C37BEA71C7E3C88B67D]]></AD_FIELD_ID>
+<!--A4C027AC88FE4C37BEA71C7E3C88B67D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A4C027AC88FE4C37BEA71C7E3C88B67D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A4C027AC88FE4C37BEA71C7E3C88B67D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A4C027AC88FE4C37BEA71C7E3C88B67D-->  <NAME><![CDATA[Show Company Data]]></NAME>
+<!--A4C027AC88FE4C37BEA71C7E3C88B67D-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--A4C027AC88FE4C37BEA71C7E3C88B67D-->  <AD_TAB_ID><![CDATA[1000500001]]></AD_TAB_ID>
+<!--A4C027AC88FE4C37BEA71C7E3C88B67D-->  <AD_COLUMN_ID><![CDATA[D9DD2D28EC204CE7BC17C121276F7078]]></AD_COLUMN_ID>
+<!--A4C027AC88FE4C37BEA71C7E3C88B67D-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--A4C027AC88FE4C37BEA71C7E3C88B67D-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--A4C027AC88FE4C37BEA71C7E3C88B67D-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--A4C027AC88FE4C37BEA71C7E3C88B67D-->  <SEQNO><![CDATA[90]]></SEQNO>
+<!--A4C027AC88FE4C37BEA71C7E3C88B67D-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--A4C027AC88FE4C37BEA71C7E3C88B67D-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--A4C027AC88FE4C37BEA71C7E3C88B67D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A4C027AC88FE4C37BEA71C7E3C88B67D-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--A4C027AC88FE4C37BEA71C7E3C88B67D-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--A4C027AC88FE4C37BEA71C7E3C88B67D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--A4C027AC88FE4C37BEA71C7E3C88B67D--></AD_FIELD>
+
 <!--A4D845FE10D34CA2BA912B9192421D4B--><AD_FIELD>
 <!--A4D845FE10D34CA2BA912B9192421D4B-->  <AD_FIELD_ID><![CDATA[A4D845FE10D34CA2BA912B9192421D4B]]></AD_FIELD_ID>
 <!--A4D845FE10D34CA2BA912B9192421D4B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_MESSAGE.xml	Thu Jul 29 16:10:28 2010 +0200
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml	Mon Aug 02 08:18:10 2010 +0200
@@ -31846,6 +31846,17 @@
 <!--8B03AFC7AAEC4EEBB7364F2BB9A80C99-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8B03AFC7AAEC4EEBB7364F2BB9A80C99--></AD_MESSAGE>
 
+<!--8D490FAC95814DD2BC9C061E9FAC4568--><AD_MESSAGE>
+<!--8D490FAC95814DD2BC9C061E9FAC4568-->  <AD_MESSAGE_ID><![CDATA[8D490FAC95814DD2BC9C061E9FAC4568]]></AD_MESSAGE_ID>
+<!--8D490FAC95814DD2BC9C061E9FAC4568-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8D490FAC95814DD2BC9C061E9FAC4568-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8D490FAC95814DD2BC9C061E9FAC4568-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8D490FAC95814DD2BC9C061E9FAC4568-->  <VALUE><![CDATA[CapacityZero]]></VALUE>
+<!--8D490FAC95814DD2BC9C061E9FAC4568-->  <MSGTEXT><![CDATA[The following product has capacity 0. Please set a proper capacity and run the process again:]]></MSGTEXT>
+<!--8D490FAC95814DD2BC9C061E9FAC4568-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--8D490FAC95814DD2BC9C061E9FAC4568-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--8D490FAC95814DD2BC9C061E9FAC4568--></AD_MESSAGE>
+
 <!--8D7E3ABF6E02498FBCB36040FBCB82AC--><AD_MESSAGE>
 <!--8D7E3ABF6E02498FBCB36040FBCB82AC-->  <AD_MESSAGE_ID><![CDATA[8D7E3ABF6E02498FBCB36040FBCB82AC]]></AD_MESSAGE_ID>
 <!--8D7E3ABF6E02498FBCB36040FBCB82AC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -31976,7 +31987,7 @@
 <!--968C37CD41AD45C3AD92D394CC357A90-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--968C37CD41AD45C3AD92D394CC357A90-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--968C37CD41AD45C3AD92D394CC357A90-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--968C37CD41AD45C3AD92D394CC357A90-->  <VALUE><![CDATA[FIN_FINACC_PAYMETHOD_UNIQUEKEY]]></VALUE>
+<!--968C37CD41AD45C3AD92D394CC357A90-->  <VALUE><![CDATA[FIN_FINACC_PAYMENTMETHOD_UN]]></VALUE>
 <!--968C37CD41AD45C3AD92D394CC357A90-->  <MSGTEXT><![CDATA[There already exists a configuration defined for this Financial Account and Payment Method.]]></MSGTEXT>
 <!--968C37CD41AD45C3AD92D394CC357A90-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
 <!--968C37CD41AD45C3AD92D394CC357A90-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
--- a/src-db/database/sourcedata/AD_MODULE.xml	Thu Jul 29 16:10:28 2010 +0200
+++ b/src-db/database/sourcedata/AD_MODULE.xml	Mon Aug 02 08:18:10 2010 +0200
@@ -6,7 +6,7 @@
 <!--0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0-->  <NAME><![CDATA[core]]></NAME>
-<!--0-->  <VERSION><![CDATA[2.50.17732]]></VERSION>
+<!--0-->  <VERSION><![CDATA[2.50.17989]]></VERSION>
 <!--0-->  <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION>
 <!--0-->  <HELP><![CDATA[Core module is the base one, all developments in core are included as part of the standard Openbravo ERP.]]></HELP>
 <!--0-->  <URL><![CDATA[www.openbravo.com]]></URL>
--- a/src-db/database/sourcedata/AD_PROCESS_PARA.xml	Thu Jul 29 16:10:28 2010 +0200
+++ b/src-db/database/sourcedata/AD_PROCESS_PARA.xml	Mon Aug 02 08:18:10 2010 +0200
@@ -445,8 +445,8 @@
 <!--152-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
 <!--152-->  <AD_PROCESS_ID><![CDATA[118]]></AD_PROCESS_ID>
 <!--152-->  <SEQNO><![CDATA[10]]></SEQNO>
-<!--152-->  <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
-<!--152-->  <AD_REFERENCE_VALUE_ID><![CDATA[130]]></AD_REFERENCE_VALUE_ID>
+<!--152-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--152-->  <AD_VAL_RULE_ID><![CDATA[130]]></AD_VAL_RULE_ID>
 <!--152-->  <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
 <!--152-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--152-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
--- a/src-db/database/sourcedata/AD_REFERENCE.xml	Thu Jul 29 16:10:28 2010 +0200
+++ b/src-db/database/sourcedata/AD_REFERENCE.xml	Mon Aug 02 08:18:10 2010 +0200
@@ -4411,6 +4411,19 @@
 <!--22F546D49D3A48E1B2B4F50446A8DE58-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
 <!--22F546D49D3A48E1B2B4F50446A8DE58--></AD_REFERENCE>
 
+<!--27A729423DEE4023B8B799377CB19D11--><AD_REFERENCE>
+<!--27A729423DEE4023B8B799377CB19D11-->  <AD_REFERENCE_ID><![CDATA[27A729423DEE4023B8B799377CB19D11]]></AD_REFERENCE_ID>
+<!--27A729423DEE4023B8B799377CB19D11-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--27A729423DEE4023B8B799377CB19D11-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--27A729423DEE4023B8B799377CB19D11-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--27A729423DEE4023B8B799377CB19D11-->  <NAME><![CDATA[C_poc_doctype_template HeaderMargin]]></NAME>
+<!--27A729423DEE4023B8B799377CB19D11-->  <DESCRIPTION><![CDATA[List indicating types of space]]></DESCRIPTION>
+<!--27A729423DEE4023B8B799377CB19D11-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--27A729423DEE4023B8B799377CB19D11-->  <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE>
+<!--27A729423DEE4023B8B799377CB19D11-->  <PARENTREFERENCE_ID><![CDATA[17]]></PARENTREFERENCE_ID>
+<!--27A729423DEE4023B8B799377CB19D11-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
+<!--27A729423DEE4023B8B799377CB19D11--></AD_REFERENCE>
+
 <!--295DC3D3A3D14DFB84739181DDE941A2--><AD_REFERENCE>
 <!--295DC3D3A3D14DFB84739181DDE941A2-->  <AD_REFERENCE_ID><![CDATA[295DC3D3A3D14DFB84739181DDE941A2]]></AD_REFERENCE_ID>
 <!--295DC3D3A3D14DFB84739181DDE941A2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_REF_LIST.xml	Thu Jul 29 16:10:28 2010 +0200
+++ b/src-db/database/sourcedata/AD_REF_LIST.xml	Mon Aug 02 08:18:10 2010 +0200
@@ -8931,6 +8931,17 @@
 <!--55F94DB55BD848B99ED7488B45098A48-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--55F94DB55BD848B99ED7488B45098A48--></AD_REF_LIST>
 
+<!--5646BC21763F4C3FB6A819C587D29025--><AD_REF_LIST>
+<!--5646BC21763F4C3FB6A819C587D29025-->  <AD_REF_LIST_ID><![CDATA[5646BC21763F4C3FB6A819C587D29025]]></AD_REF_LIST_ID>
+<!--5646BC21763F4C3FB6A819C587D29025-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5646BC21763F4C3FB6A819C587D29025-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5646BC21763F4C3FB6A819C587D29025-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5646BC21763F4C3FB6A819C587D29025-->  <VALUE><![CDATA[small]]></VALUE>
+<!--5646BC21763F4C3FB6A819C587D29025-->  <NAME><![CDATA[Small]]></NAME>
+<!--5646BC21763F4C3FB6A819C587D29025-->  <AD_REFERENCE_ID><![CDATA[27A729423DEE4023B8B799377CB19D11]]></AD_REFERENCE_ID>
+<!--5646BC21763F4C3FB6A819C587D29025-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--5646BC21763F4C3FB6A819C587D29025--></AD_REF_LIST>
+
 <!--5795507EA4AB4B8FB01439F0E541BFC5--><AD_REF_LIST>
 <!--5795507EA4AB4B8FB01439F0E541BFC5-->  <AD_REF_LIST_ID><![CDATA[5795507EA4AB4B8FB01439F0E541BFC5]]></AD_REF_LIST_ID>
 <!--5795507EA4AB4B8FB01439F0E541BFC5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -9204,6 +9215,17 @@
 <!--7786557D5FF3474F95A4E5EC699EB750-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7786557D5FF3474F95A4E5EC699EB750--></AD_REF_LIST>
 
+<!--78524A7ACD84487A837E2444E9978310--><AD_REF_LIST>
+<!--78524A7ACD84487A837E2444E9978310-->  <AD_REF_LIST_ID><![CDATA[78524A7ACD84487A837E2444E9978310]]></AD_REF_LIST_ID>
+<!--78524A7ACD84487A837E2444E9978310-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--78524A7ACD84487A837E2444E9978310-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--78524A7ACD84487A837E2444E9978310-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--78524A7ACD84487A837E2444E9978310-->  <VALUE><![CDATA[medium]]></VALUE>
+<!--78524A7ACD84487A837E2444E9978310-->  <NAME><![CDATA[Medium]]></NAME>
+<!--78524A7ACD84487A837E2444E9978310-->  <AD_REFERENCE_ID><![CDATA[27A729423DEE4023B8B799377CB19D11]]></AD_REFERENCE_ID>
+<!--78524A7ACD84487A837E2444E9978310-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--78524A7ACD84487A837E2444E9978310--></AD_REF_LIST>
+
 <!--7A0B9F7FCEE74C0DA09219A4BDBB8B06--><AD_REF_LIST>
 <!--7A0B9F7FCEE74C0DA09219A4BDBB8B06-->  <AD_REF_LIST_ID><![CDATA[7A0B9F7FCEE74C0DA09219A4BDBB8B06]]></AD_REF_LIST_ID>
 <!--7A0B9F7FCEE74C0DA09219A4BDBB8B06-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -9667,6 +9689,17 @@
 <!--B2B38218AB484E3D99FB07A7AC71F894-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--B2B38218AB484E3D99FB07A7AC71F894--></AD_REF_LIST>
 
+<!--B2E6B90D0AA4477C92772D4597BED03C--><AD_REF_LIST>
+<!--B2E6B90D0AA4477C92772D4597BED03C-->  <AD_REF_LIST_ID><![CDATA[B2E6B90D0AA4477C92772D4597BED03C]]></AD_REF_LIST_ID>
+<!--B2E6B90D0AA4477C92772D4597BED03C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B2E6B90D0AA4477C92772D4597BED03C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B2E6B90D0AA4477C92772D4597BED03C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B2E6B90D0AA4477C92772D4597BED03C-->  <VALUE><![CDATA[large]]></VALUE>
+<!--B2E6B90D0AA4477C92772D4597BED03C-->  <NAME><![CDATA[Large]]></NAME>
+<!--B2E6B90D0AA4477C92772D4597BED03C-->  <AD_REFERENCE_ID><![CDATA[27A729423DEE4023B8B799377CB19D11]]></AD_REFERENCE_ID>
+<!--B2E6B90D0AA4477C92772D4597BED03C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B2E6B90D0AA4477C92772D4597BED03C--></AD_REF_LIST>
+
 <!--B32CDCBD5DDC4F60B965BE67578BCA6D--><AD_REF_LIST>
 <!--B32CDCBD5DDC4F60B965BE67578BCA6D-->  <AD_REF_LIST_ID><![CDATA[B32CDCBD5DDC4F60B965BE67578BCA6D]]></AD_REF_LIST_ID>
 <!--B32CDCBD5DDC4F60B965BE67578BCA6D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Thu Jul 29 16:10:28 2010 +0200
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Mon Aug 02 08:18:10 2010 +0200
@@ -1802,16 +1802,6 @@
 <!--802353-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--802353--></AD_TEXTINTERFACES>
 
-<!--802355--><AD_TEXTINTERFACES>
-<!--802355-->  <AD_TEXTINTERFACES_ID><![CDATA[802355]]></AD_TEXTINTERFACES_ID>
-<!--802355-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--802355-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--802355-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--802355-->  <TEXT><![CDATA[Code]]></TEXT>
-<!--802355-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--802355-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--802355--></AD_TEXTINTERFACES>
-
 <!--802357--><AD_TEXTINTERFACES>
 <!--802357-->  <AD_TEXTINTERFACES_ID><![CDATA[802357]]></AD_TEXTINTERFACES_ID>
 <!--802357-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -10259,39 +10249,6 @@
 <!--807459-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--807459--></AD_TEXTINTERFACES>
 
-<!--807473--><AD_TEXTINTERFACES>
-<!--807473-->  <AD_TEXTINTERFACES_ID><![CDATA[807473]]></AD_TEXTINTERFACES_ID>
-<!--807473-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--807473-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--807473-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--807473-->  <TEXT><![CDATA[Fax Order to:]]></TEXT>
-<!--807473-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptC_OrderPO.jrxml]]></FILENAME>
-<!--807473-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--807473-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--807473--></AD_TEXTINTERFACES>
-
-<!--807474--><AD_TEXTINTERFACES>
-<!--807474-->  <AD_TEXTINTERFACES_ID><![CDATA[807474]]></AD_TEXTINTERFACES_ID>
-<!--807474-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--807474-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--807474-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--807474-->  <TEXT><![CDATA[Fax No.:]]></TEXT>
-<!--807474-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptC_OrderPO.jrxml]]></FILENAME>
-<!--807474-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--807474-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--807474--></AD_TEXTINTERFACES>
-
-<!--807505--><AD_TEXTINTERFACES>
-<!--807505-->  <AD_TEXTINTERFACES_ID><![CDATA[807505]]></AD_TEXTINTERFACES_ID>
-<!--807505-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--807505-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--807505-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--807505-->  <TEXT><![CDATA[REGARDS]]></TEXT>
-<!--807505-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptC_OrderPO_Lines.jrxml]]></FILENAME>
-<!--807505-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--807505-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--807505--></AD_TEXTINTERFACES>
-
 <!--807508--><AD_TEXTINTERFACES>
 <!--807508-->  <AD_TEXTINTERFACES_ID><![CDATA[807508]]></AD_TEXTINTERFACES_ID>
 <!--807508-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -11097,17 +11054,6 @@
 <!--808386-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--808386--></AD_TEXTINTERFACES>
 
-<!--808423--><AD_TEXTINTERFACES>
-<!--808423-->  <AD_TEXTINTERFACES_ID><![CDATA[808423]]></AD_TEXTINTERFACES_ID>
-<!--808423-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--808423-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--808423-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--808423-->  <TEXT><![CDATA[PAGE:]]></TEXT>
-<!--808423-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptC_OrderPO.jrxml]]></FILENAME>
-<!--808423-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--808423-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--808423--></AD_TEXTINTERFACES>
-
 <!--808452--><AD_TEXTINTERFACES>
 <!--808452-->  <AD_TEXTINTERFACES_ID><![CDATA[808452]]></AD_TEXTINTERFACES_ID>
 <!--808452-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -11451,17 +11397,6 @@
 <!--808602-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--808602--></AD_TEXTINTERFACES>
 
-<!--808603--><AD_TEXTINTERFACES>
-<!--808603-->  <AD_TEXTINTERFACES_ID><![CDATA[808603]]></AD_TEXTINTERFACES_ID>
-<!--808603-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--808603-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--808603-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--808603-->  <TEXT><![CDATA[Internet:]]></TEXT>
-<!--808603-->  <FILENAME><![CDATA[/org/openbravo/erpReports/C_OrderJR.jrxml]]></FILENAME>
-<!--808603-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--808603-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--808603--></AD_TEXTINTERFACES>
-
 <!--808604--><AD_TEXTINTERFACES>
 <!--808604-->  <AD_TEXTINTERFACES_ID><![CDATA[808604]]></AD_TEXTINTERFACES_ID>
 <!--808604-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -11472,17 +11407,6 @@
 <!--808604-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--808604--></AD_TEXTINTERFACES>
 
-<!--808607--><AD_TEXTINTERFACES>
-<!--808607-->  <AD_TEXTINTERFACES_ID><![CDATA[808607]]></AD_TEXTINTERFACES_ID>
-<!--808607-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--808607-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--808607-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--808607-->  <TEXT><![CDATA[Net]]></TEXT>
-<!--808607-->  <FILENAME><![CDATA[/org/openbravo/erpReports/C_OrderLinesJR.jrxml]]></FILENAME>
-<!--808607-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--808607-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--808607--></AD_TEXTINTERFACES>
-
 <!--808630--><AD_TEXTINTERFACES>
 <!--808630-->  <AD_TEXTINTERFACES_ID><![CDATA[808630]]></AD_TEXTINTERFACES_ID>
 <!--808630-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -11549,27 +11473,6 @@
 <!--808677-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--808677--></AD_TEXTINTERFACES>
 
-<!--808683--><AD_TEXTINTERFACES>
-<!--808683-->  <AD_TEXTINTERFACES_ID><![CDATA[808683]]></AD_TEXTINTERFACES_ID>
-<!--808683-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--808683-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--808683-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--808683-->  <TEXT><![CDATA[Immediate]]></TEXT>
-<!--808683-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--808683-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--808683--></AD_TEXTINTERFACES>
-
-<!--808688--><AD_TEXTINTERFACES>
-<!--808688-->  <AD_TEXTINTERFACES_ID><![CDATA[808688]]></AD_TEXTINTERFACES_ID>
-<!--808688-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--808688-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--808688-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--808688-->  <TEXT><![CDATA[Size]]></TEXT>
-<!--808688-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptC_OrderPO_Lines.jrxml]]></FILENAME>
-<!--808688-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--808688-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--808688--></AD_TEXTINTERFACES>
-
 <!--808692--><AD_TEXTINTERFACES>
 <!--808692-->  <AD_TEXTINTERFACES_ID><![CDATA[808692]]></AD_TEXTINTERFACES_ID>
 <!--808692-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -11865,37 +11768,6 @@
 <!--809874-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--809874--></AD_TEXTINTERFACES>
 
-<!--809877--><AD_TEXTINTERFACES>
-<!--809877-->  <AD_TEXTINTERFACES_ID><![CDATA[809877]]></AD_TEXTINTERFACES_ID>
-<!--809877-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--809877-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--809877-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--809877-->  <TEXT><![CDATA[from 9:00 to 13:00]]></TEXT>
-<!--809877-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptC_Invoice.jrxml]]></FILENAME>
-<!--809877-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--809877-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--809877--></AD_TEXTINTERFACES>
-
-<!--809878--><AD_TEXTINTERFACES>
-<!--809878-->  <AD_TEXTINTERFACES_ID><![CDATA[809878]]></AD_TEXTINTERFACES_ID>
-<!--809878-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--809878-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--809878-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--809878-->  <TEXT><![CDATA[Delivery Expense]]></TEXT>
-<!--809878-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--809878-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--809878--></AD_TEXTINTERFACES>
-
-<!--809879--><AD_TEXTINTERFACES>
-<!--809879-->  <AD_TEXTINTERFACES_ID><![CDATA[809879]]></AD_TEXTINTERFACES_ID>
-<!--809879-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--809879-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--809879-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--809879-->  <TEXT><![CDATA[Included]]></TEXT>
-<!--809879-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--809879-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--809879--></AD_TEXTINTERFACES>
-
 <!--809880--><AD_TEXTINTERFACES>
 <!--809880-->  <AD_TEXTINTERFACES_ID><![CDATA[809880]]></AD_TEXTINTERFACES_ID>
 <!--809880-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -11906,28 +11778,6 @@
 <!--809880-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--809880--></AD_TEXTINTERFACES>
 
-<!--809882--><AD_TEXTINTERFACES>
-<!--809882-->  <AD_TEXTINTERFACES_ID><![CDATA[809882]]></AD_TEXTINTERFACES_ID>
-<!--809882-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--809882-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--809882-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--809882-->  <TEXT><![CDATA[If there is no reply within 48 hours the order will be considered as accepted.]]></TEXT>
-<!--809882-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptC_Invoice.jrxml]]></FILENAME>
-<!--809882-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--809882-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--809882--></AD_TEXTINTERFACES>
-
-<!--809883--><AD_TEXTINTERFACES>
-<!--809883-->  <AD_TEXTINTERFACES_ID><![CDATA[809883]]></AD_TEXTINTERFACES_ID>
-<!--809883-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--809883-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--809883-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--809883-->  <TEXT><![CDATA[Include order No. in shipment and invoice]]></TEXT>
-<!--809883-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptC_Invoice.jrxml]]></FILENAME>
-<!--809883-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--809883-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--809883--></AD_TEXTINTERFACES>
-
 <!--809884--><AD_TEXTINTERFACES>
 <!--809884-->  <AD_TEXTINTERFACES_ID><![CDATA[809884]]></AD_TEXTINTERFACES_ID>
 <!--809884-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -11938,17 +11788,6 @@
 <!--809884-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--809884--></AD_TEXTINTERFACES>
 
-<!--809886--><AD_TEXTINTERFACES>
-<!--809886-->  <AD_TEXTINTERFACES_ID><![CDATA[809886]]></AD_TEXTINTERFACES_ID>
-<!--809886-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--809886-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--809886-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--809886-->  <TEXT><![CDATA[Total (without taxes):]]></TEXT>
-<!--809886-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptC_Invoice_Lines.jrxml]]></FILENAME>
-<!--809886-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--809886-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--809886--></AD_TEXTINTERFACES>
-
 <!--809887--><AD_TEXTINTERFACES>
 <!--809887-->  <AD_TEXTINTERFACES_ID><![CDATA[809887]]></AD_TEXTINTERFACES_ID>
 <!--809887-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -12961,39 +12800,6 @@
 <!--1000100017-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1000100017--></AD_TEXTINTERFACES>
 
-<!--1000200004--><AD_TEXTINTERFACES>
-<!--1000200004-->  <AD_TEXTINTERFACES_ID><![CDATA[1000200004]]></AD_TEXTINTERFACES_ID>
-<!--1000200004-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--1000200004-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--1000200004-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--1000200004-->  <TEXT><![CDATA[FAX no.:]]></TEXT>
-<!--1000200004-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptC_Invoice.jrxml]]></FILENAME>
-<!--1000200004-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--1000200004-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1000200004--></AD_TEXTINTERFACES>
-
-<!--1000200005--><AD_TEXTINTERFACES>
-<!--1000200005-->  <AD_TEXTINTERFACES_ID><![CDATA[1000200005]]></AD_TEXTINTERFACES_ID>
-<!--1000200005-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--1000200005-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--1000200005-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--1000200005-->  <TEXT><![CDATA[Phone no.:]]></TEXT>
-<!--1000200005-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptC_Invoice.jrxml]]></FILENAME>
-<!--1000200005-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--1000200005-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1000200005--></AD_TEXTINTERFACES>
-
-<!--1000200006--><AD_TEXTINTERFACES>
-<!--1000200006-->  <AD_TEXTINTERFACES_ID><![CDATA[1000200006]]></AD_TEXTINTERFACES_ID>
-<!--1000200006-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--1000200006-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--1000200006-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--1000200006-->  <TEXT><![CDATA[Total (]]></TEXT>
-<!--1000200006-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptC_Invoice.jrxml]]></FILENAME>
-<!--1000200006-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--1000200006-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1000200006--></AD_TEXTINTERFACES>
-
 <!--1000200007--><AD_TEXTINTERFACES>
 <!--1000200007-->  <AD_TEXTINTERFACES_ID><![CDATA[1000200007]]></AD_TEXTINTERFACES_ID>
 <!--1000200007-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -14990,28 +14796,6 @@
 <!--1002500001-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1002500001--></AD_TEXTINTERFACES>
 
-<!--1002700003--><AD_TEXTINTERFACES>
-<!--1002700003-->  <AD_TEXTINTERFACES_ID><![CDATA[1002700003]]></AD_TEXTINTERFACES_ID>
-<!--1002700003-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--1002700003-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--1002700003-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--1002700003-->  <TEXT><![CDATA[Total (]]></TEXT>
-<!--1002700003-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptC_OrderPO_Lines.jrxml]]></FILENAME>
-<!--1002700003-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--1002700003-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1002700003--></AD_TEXTINTERFACES>
-
-<!--1002700005--><AD_TEXTINTERFACES>
-<!--1002700005-->  <AD_TEXTINTERFACES_ID><![CDATA[1002700005]]></AD_TEXTINTERFACES_ID>
-<!--1002700005-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--1002700005-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--1002700005-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--1002700005-->  <TEXT><![CDATA[Invoice Rule]]></TEXT>
-<!--1002700005-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptC_OrderPO.jrxml]]></FILENAME>
-<!--1002700005-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--1002700005-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1002700005--></AD_TEXTINTERFACES>
-
 <!--1002700006--><AD_TEXTINTERFACES>
 <!--1002700006-->  <AD_TEXTINTERFACES_ID><![CDATA[1002700006]]></AD_TEXTINTERFACES_ID>
 <!--1002700006-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -15220,28 +15004,6 @@
 <!--1003900034-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1003900034--></AD_TEXTINTERFACES>
 
-<!--1003900035--><AD_TEXTINTERFACES>
-<!--1003900035-->  <AD_TEXTINTERFACES_ID><![CDATA[1003900035]]></AD_TEXTINTERFACES_ID>
-<!--1003900035-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--1003900035-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--1003900035-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--1003900035-->  <TEXT><![CDATA[Phone:]]></TEXT>
-<!--1003900035-->  <FILENAME><![CDATA[/org/openbravo/erpReports/C_OrderJR.jrxml]]></FILENAME>
-<!--1003900035-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--1003900035-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1003900035--></AD_TEXTINTERFACES>
-
-<!--1003900036--><AD_TEXTINTERFACES>
-<!--1003900036-->  <AD_TEXTINTERFACES_ID><![CDATA[1003900036]]></AD_TEXTINTERFACES_ID>
-<!--1003900036-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--1003900036-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--1003900036-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--1003900036-->  <TEXT><![CDATA[Fax:]]></TEXT>
-<!--1003900036-->  <FILENAME><![CDATA[/org/openbravo/erpReports/C_OrderJR.jrxml]]></FILENAME>
-<!--1003900036-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--1003900036-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1003900036--></AD_TEXTINTERFACES>
-
 <!--1003900037--><AD_TEXTINTERFACES>
 <!--1003900037-->  <AD_TEXTINTERFACES_ID><![CDATA[1003900037]]></AD_TEXTINTERFACES_ID>
 <!--1003900037-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -16143,6 +15905,17 @@
 <!--1005900031-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1005900031--></AD_TEXTINTERFACES>
 
+<!--00643C93CD244B02B236FA5607258820--><AD_TEXTINTERFACES>
+<!--00643C93CD244B02B236FA5607258820-->  <AD_TEXTINTERFACES_ID><![CDATA[00643C93CD244B02B236FA5607258820]]></AD_TEXTINTERFACES_ID>
+<!--00643C93CD244B02B236FA5607258820-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--00643C93CD244B02B236FA5607258820-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--00643C93CD244B02B236FA5607258820-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--00643C93CD244B02B236FA5607258820-->  <TEXT><![CDATA[VOIDED]]></TEXT>
+<!--00643C93CD244B02B236FA5607258820-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptC_Invoice.jrxml]]></FILENAME>
+<!--00643C93CD244B02B236FA5607258820-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--00643C93CD244B02B236FA5607258820-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--00643C93CD244B02B236FA5607258820--></AD_TEXTINTERFACES>
+
 <!--00B7AF5613384D16BD23168FF64D24CE--><AD_TEXTINTERFACES>
 <!--00B7AF5613384D16BD23168FF64D24CE-->  <AD_TEXTINTERFACES_ID><![CDATA[00B7AF5613384D16BD23168FF64D24CE]]></AD_TEXTINTERFACES_ID>
 <!--00B7AF5613384D16BD23168FF64D24CE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -16165,17 +15938,6 @@
 <!--023D343FA6294F3B9B0F8B1CA57712FB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--023D343FA6294F3B9B0F8B1CA57712FB--></AD_TEXTINTERFACES>
 
-<!--03581A9E5D284DBD8988172172E4F3E9--><AD_TEXTINTERFACES>
-<!--03581A9E5D284DBD8988172172E4F3E9-->  <AD_TEXTINTERFACES_ID><![CDATA[03581A9E5D284DBD8988172172E4F3E9]]></AD_TEXTINTERFACES_ID>
-<!--03581A9E5D284DBD8988172172E4F3E9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--03581A9E5D284DBD8988172172E4F3E9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--03581A9E5D284DBD8988172172E4F3E9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--03581A9E5D284DBD8988172172E4F3E9-->  <TEXT><![CDATA[Delivery date:]]></TEXT>
-<!--03581A9E5D284DBD8988172172E4F3E9-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptM_InOut.jrxml]]></FILENAME>
-<!--03581A9E5D284DBD8988172172E4F3E9-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--03581A9E5D284DBD8988172172E4F3E9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--03581A9E5D284DBD8988172172E4F3E9--></AD_TEXTINTERFACES>
-
 <!--04AF48556B2E4A22AB53FFA3B4BF2DD3--><AD_TEXTINTERFACES>
 <!--04AF48556B2E4A22AB53FFA3B4BF2DD3-->  <AD_TEXTINTERFACES_ID><![CDATA[04AF48556B2E4A22AB53FFA3B4BF2DD3]]></AD_TEXTINTERFACES_ID>
 <!--04AF48556B2E4A22AB53FFA3B4BF2DD3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -16231,6 +15993,28 @@
 <!--06E61B009FC911DDB11B0FCE2FEEA29F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--06E61B009FC911DDB11B0FCE2FEEA29F--></AD_TEXTINTERFACES>
 
+<!--0853D54D853C414990160ADE1E8BF3F4--><AD_TEXTINTERFACES>
+<!--0853D54D853C414990160ADE1E8BF3F4-->  <AD_TEXTINTERFACES_ID><![CDATA[0853D54D853C414990160ADE1E8BF3F4]]></AD_TEXTINTERFACES_ID>
+<!--0853D54D853C414990160ADE1E8BF3F4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0853D54D853C414990160ADE1E8BF3F4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0853D54D853C414990160ADE1E8BF3F4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0853D54D853C414990160ADE1E8BF3F4-->  <TEXT><![CDATA[\n]]></TEXT>
+<!--0853D54D853C414990160ADE1E8BF3F4-->  <FILENAME><![CDATA[/org/openbravo/erpReports/C_OrderJR.jrxml]]></FILENAME>
+<!--0853D54D853C414990160ADE1E8BF3F4-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--0853D54D853C414990160ADE1E8BF3F4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--0853D54D853C414990160ADE1E8BF3F4--></AD_TEXTINTERFACES>
+
+<!--085A3DDF2C8749EFA23842C61B518D9C--><AD_TEXTINTERFACES>
+<!--085A3DDF2C8749EFA23842C61B518D9C-->  <AD_TEXTINTERFACES_ID><![CDATA[085A3DDF2C8749EFA23842C61B518D9C]]></AD_TEXTINTERFACES_ID>
+<!--085A3DDF2C8749EFA23842C61B518D9C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--085A3DDF2C8749EFA23842C61B518D9C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--085A3DDF2C8749EFA23842C61B518D9C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--085A3DDF2C8749EFA23842C61B518D9C-->  <TEXT><![CDATA[VO]]></TEXT>
+<!--085A3DDF2C8749EFA23842C61B518D9C-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptM_InOut.jrxml]]></FILENAME>
+<!--085A3DDF2C8749EFA23842C61B518D9C-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--085A3DDF2C8749EFA23842C61B518D9C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--085A3DDF2C8749EFA23842C61B518D9C--></AD_TEXTINTERFACES>
+
 <!--09B882E340B94131BEFF131264165994--><AD_TEXTINTERFACES>
 <!--09B882E340B94131BEFF131264165994-->  <AD_TEXTINTERFACES_ID><![CDATA[09B882E340B94131BEFF131264165994]]></AD_TEXTINTERFACES_ID>
 <!--09B882E340B94131BEFF131264165994-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -16374,6 +16158,28 @@
 <!--1686B4EFC64047E287835737FD0DB510-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1686B4EFC64047E287835737FD0DB510--></AD_TEXTINTERFACES>
 
+<!--17D8198CE214458582B04F980C4B5E53--><AD_TEXTINTERFACES>
+<!--17D8198CE214458582B04F980C4B5E53-->  <AD_TEXTINTERFACES_ID><![CDATA[17D8198CE214458582B04F980C4B5E53]]></AD_TEXTINTERFACES_ID>
+<!--17D8198CE214458582B04F980C4B5E53-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--17D8198CE214458582B04F980C4B5E53-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--17D8198CE214458582B04F980C4B5E53-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--17D8198CE214458582B04F980C4B5E53-->  <TEXT><![CDATA[TOTAL (]]></TEXT>
+<!--17D8198CE214458582B04F980C4B5E53-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptC_OrderPO_Lines.jrxml]]></FILENAME>
+<!--17D8198CE214458582B04F980C4B5E53-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--17D8198CE214458582B04F980C4B5E53-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--17D8198CE214458582B04F980C4B5E53--></AD_TEXTINTERFACES>
+
+<!--18D599A7C6A745C380B0AE85DEB49EFC--><AD_TEXTINTERFACES>
+<!--18D599A7C6A745C380B0AE85DEB49EFC-->  <AD_TEXTINTERFACES_ID><![CDATA[18D599A7C6A745C380B0AE85DEB49EFC]]></AD_TEXTINTERFACES_ID>
+<!--18D599A7C6A745C380B0AE85DEB49EFC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--18D599A7C6A745C380B0AE85DEB49EFC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--18D599A7C6A745C380B0AE85DEB49EFC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--18D599A7C6A745C380B0AE85DEB49EFC-->  <TEXT><![CDATA[VOIDED]]></TEXT>
+<!--18D599A7C6A745C380B0AE85DEB49EFC-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptC_OrderPO.jrxml]]></FILENAME>
+<!--18D599A7C6A745C380B0AE85DEB49EFC-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--18D599A7C6A745C380B0AE85DEB49EFC-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--18D599A7C6A745C380B0AE85DEB49EFC--></AD_TEXTINTERFACES>
+
 <!--198E64E82E6611DEB506A739ACCB7F46--><AD_TEXTINTERFACES>
 <!--198E64E82E6611DEB506A739ACCB7F46-->  <AD_TEXTINTERFACES_ID><![CDATA[198E64E82E6611DEB506A739ACCB7F46]]></AD_TEXTINTERFACES_ID>
 <!--198E64E82E6611DEB506A739ACCB7F46-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -16506,6 +16312,17 @@
 <!--203E574E2E5211DE83B8B39281CDF47D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--203E574E2E5211DE83B8B39281CDF47D--></AD_TEXTINTERFACES>
 
+<!--2065A97A4CE845F7900360E9DA5A0E69--><AD_TEXTINTERFACES>
+<!--2065A97A4CE845F7900360E9DA5A0E69-->  <AD_TEXTINTERFACES_ID><![CDATA[2065A97A4CE845F7900360E9DA5A0E69]]></AD_TEXTINTERFACES_ID>
+<!--2065A97A4CE845F7900360E9DA5A0E69-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2065A97A4CE845F7900360E9DA5A0E69-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2065A97A4CE845F7900360E9DA5A0E69-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2065A97A4CE845F7900360E9DA5A0E69-->  <TEXT><![CDATA[VO]]></TEXT>
+<!--2065A97A4CE845F7900360E9DA5A0E69-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptC_Invoice.jrxml]]></FILENAME>
+<!--2065A97A4CE845F7900360E9DA5A0E69-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--2065A97A4CE845F7900360E9DA5A0E69-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2065A97A4CE845F7900360E9DA5A0E69--></AD_TEXTINTERFACES>
+
 <!--2077C79A41574E0AAA82EDE1895E2D0C--><AD_TEXTINTERFACES>
 <!--2077C79A41574E0AAA82EDE1895E2D0C-->  <AD_TEXTINTERFACES_ID><![CDATA[2077C79A41574E0AAA82EDE1895E2D0C]]></AD_TEXTINTERFACES_ID>
 <!--2077C79A41574E0AAA82EDE1895E2D0C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -16539,17 +16356,6 @@
 <!--21444EAA2E5211DE95D5ABB0C6CBBF57-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--21444EAA2E5211DE95D5ABB0C6CBBF57--></AD_TEXTINTERFACES>
 
-<!--21BBEA7F34B84E108034F0B1E4563D85--><AD_TEXTINTERFACES>
-<!--21BBEA7F34B84E108034F0B1E4563D85-->  <AD_TEXTINTERFACES_ID><![CDATA[21BBEA7F34B84E108034F0B1E4563D85]]></AD_TEXTINTERFACES_ID>
-<!--21BBEA7F34B84E108034F0B1E4563D85-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--21BBEA7F34B84E108034F0B1E4563D85-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--21BBEA7F34B84E108034F0B1E4563D85-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--21BBEA7F34B84E108034F0B1E4563D85-->  <TEXT><![CDATA[LICENSE]]></TEXT>
-<!--21BBEA7F34B84E108034F0B1E4563D85-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptM_InOut.jrxml]]></FILENAME>
-<!--21BBEA7F34B84E108034F0B1E4563D85-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--21BBEA7F34B84E108034F0B1E4563D85-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--21BBEA7F34B84E108034F0B1E4563D85--></AD_TEXTINTERFACES>
-
 <!--222BFD8719D647B59942214EACDCC867--><AD_TEXTINTERFACES>
 <!--222BFD8719D647B59942214EACDCC867-->  <AD_TEXTINTERFACES_ID><![CDATA[222BFD8719D647B59942214EACDCC867]]></AD_TEXTINTERFACES_ID>
 <!--222BFD8719D647B59942214EACDCC867-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -16714,17 +16520,6 @@
 <!--2D82E0461832484296B382E9E153E347-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--2D82E0461832484296B382E9E153E347--></AD_TEXTINTERFACES>
 
-<!--2E5505F77F574E3EBB6168F06C71C553--><AD_TEXTINTERFACES>
-<!--2E5505F77F574E3EBB6168F06C71C553-->  <AD_TEXTINTERFACES_ID><![CDATA[2E5505F77F574E3EBB6168F06C71C553]]></AD_TEXTINTERFACES_ID>
-<!--2E5505F77F574E3EBB6168F06C71C553-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--2E5505F77F574E3EBB6168F06C71C553-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--2E5505F77F574E3EBB6168F06C71C553-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--2E5505F77F574E3EBB6168F06C71C553-->  <TEXT><![CDATA[Dear customer, if you do not agree with the shipment, please respond with an explanation:]]></TEXT>
-<!--2E5505F77F574E3EBB6168F06C71C553-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptM_InOut.jrxml]]></FILENAME>
-<!--2E5505F77F574E3EBB6168F06C71C553-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--2E5505F77F574E3EBB6168F06C71C553-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--2E5505F77F574E3EBB6168F06C71C553--></AD_TEXTINTERFACES>
-
 <!--2EA94A9525A649A8B6ABCE33DC85C23F--><AD_TEXTINTERFACES>
 <!--2EA94A9525A649A8B6ABCE33DC85C23F-->  <AD_TEXTINTERFACES_ID><![CDATA[2EA94A9525A649A8B6ABCE33DC85C23F]]></AD_TEXTINTERFACES_ID>
 <!--2EA94A9525A649A8B6ABCE33DC85C23F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -16846,16 +16641,16 @@
 <!--390A325D73AB4E6C904CD553A64E97B0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--390A325D73AB4E6C904CD553A64E97B0--></AD_TEXTINTERFACES>
 
-<!--3CB597B6D87341D8A7C797ED7CFC583F--><AD_TEXTINTERFACES>
-<!--3CB597B6D87341D8A7C797ED7CFC583F-->  <AD_TEXTINTERFACES_ID><![CDATA[3CB597B6D87341D8A7C797ED7CFC583F]]></AD_TEXTINTERFACES_ID>
-<!--3CB597B6D87341D8A7C797ED7CFC583F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--3CB597B6D87341D8A7C797ED7CFC583F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--3CB597B6D87341D8A7C797ED7CFC583F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--3CB597B6D87341D8A7C797ED7CFC583F-->  <TEXT><![CDATA[Received and conformed, shipper:]]></TEXT>
-<!--3CB597B6D87341D8A7C797ED7CFC583F-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptM_InOut.jrxml]]></FILENAME>
-<!--3CB597B6D87341D8A7C797ED7CFC583F-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--3CB597B6D87341D8A7C797ED7CFC583F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--3CB597B6D87341D8A7C797ED7CFC583F--></AD_TEXTINTERFACES>
+<!--39F1C6FF551B4210BE3EC6F1904DE43B--><AD_TEXTINTERFACES>
+<!--39F1C6FF551B4210BE3EC6F1904DE43B-->  <AD_TEXTINTERFACES_ID><![CDATA[39F1C6FF551B4210BE3EC6F1904DE43B]]></AD_TEXTINTERFACES_ID>
+<!--39F1C6FF551B4210BE3EC6F1904DE43B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--39F1C6FF551B4210BE3EC6F1904DE43B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--39F1C6FF551B4210BE3EC6F1904DE43B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--39F1C6FF551B4210BE3EC6F1904DE43B-->  <TEXT><![CDATA[VO]]></TEXT>
+<!--39F1C6FF551B4210BE3EC6F1904DE43B-->  <FILENAME><![CDATA[/org/openbravo/erpReports/C_OrderJR.jrxml]]></FILENAME>
+<!--39F1C6FF551B4210BE3EC6F1904DE43B-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--39F1C6FF551B4210BE3EC6F1904DE43B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--39F1C6FF551B4210BE3EC6F1904DE43B--></AD_TEXTINTERFACES>
 
 <!--3D18477FC84749E3BD579149D6534BF9--><AD_TEXTINTERFACES>
 <!--3D18477FC84749E3BD579149D6534BF9-->  <AD_TEXTINTERFACES_ID><![CDATA[3D18477FC84749E3BD579149D6534BF9]]></AD_TEXTINTERFACES_ID>
@@ -16890,6 +16685,17 @@
 <!--413F936C37AA4E0D865BD0109ECAE092-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--413F936C37AA4E0D865BD0109ECAE092--></AD_TEXTINTERFACES>
 
+<!--43BECCD4373E45D5863610BAB294486E--><AD_TEXTINTERFACES>
+<!--43BECCD4373E45D5863610BAB294486E-->  <AD_TEXTINTERFACES_ID><![CDATA[43BECCD4373E45D5863610BAB294486E]]></AD_TEXTINTERFACES_ID>
+<!--43BECCD4373E45D5863610BAB294486E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--43BECCD4373E45D5863610BAB294486E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--43BECCD4373E45D5863610BAB294486E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--43BECCD4373E45D5863610BAB294486E-->  <TEXT><![CDATA[PRODUCT NAME]]></TEXT>
+<!--43BECCD4373E45D5863610BAB294486E-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptC_OrderPO_Lines.jrxml]]></FILENAME>
+<!--43BECCD4373E45D5863610BAB294486E-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--43BECCD4373E45D5863610BAB294486E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--43BECCD4373E45D5863610BAB294486E--></AD_TEXTINTERFACES>
+
 <!--44D1EA1FFEC24136BA583266096969E6--><AD_TEXTINTERFACES>
 <!--44D1EA1FFEC24136BA583266096969E6-->  <AD_TEXTINTERFACES_ID><![CDATA[44D1EA1FFEC24136BA583266096969E6]]></AD_TEXTINTERFACES_ID>
 <!--44D1EA1FFEC24136BA583266096969E6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -17088,28 +16894,6 @@
 <!--4D6F7EFED00711DDBE8C001D09C4A2FE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4D6F7EFED00711DDBE8C001D09C4A2FE--></AD_TEXTINTERFACES>
 
-<!--4E18593D5AC243688694F326302928E4--><AD_TEXTINTERFACES>
-<!--4E18593D5AC243688694F326302928E4-->  <AD_TEXTINTERFACES_ID><![CDATA[4E18593D5AC243688694F326302928E4]]></AD_TEXTINTERFACES_ID>
-<!--4E18593D5AC243688694F326302928E4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--4E18593D5AC243688694F326302928E4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--4E18593D5AC243688694F326302928E4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--4E18593D5AC243688694F326302928E4-->  <TEXT><![CDATA[TEMPERATURE UPON DELIVERY]]></TEXT>
-<!--4E18593D5AC243688694F326302928E4-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptM_InOut.jrxml]]></FILENAME>
-<!--4E18593D5AC243688694F326302928E4-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--4E18593D5AC243688694F326302928E4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--4E18593D5AC243688694F326302928E4--></AD_TEXTINTERFACES>
-
-<!--4EE1D9ABE4D0422AAFFE55D2AADD587A--><AD_TEXTINTERFACES>
-<!--4EE1D9ABE4D0422AAFFE55D2AADD587A-->  <AD_TEXTINTERFACES_ID><![CDATA[4EE1D9ABE4D0422AAFFE55D2AADD587A]]></AD_TEXTINTERFACES_ID>
-<!--4EE1D9ABE4D0422AAFFE55D2AADD587A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--4EE1D9ABE4D0422AAFFE55D2AADD587A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--4EE1D9ABE4D0422AAFFE55D2AADD587A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--4EE1D9ABE4D0422AAFFE55D2AADD587A-->  <TEXT><![CDATA[Tax ID]]></TEXT>
-<!--4EE1D9ABE4D0422AAFFE55D2AADD587A-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptM_InOut.jrxml]]></FILENAME>
-<!--4EE1D9ABE4D0422AAFFE55D2AADD587A-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--4EE1D9ABE4D0422AAFFE55D2AADD587A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--4EE1D9ABE4D0422AAFFE55D2AADD587A--></AD_TEXTINTERFACES>
-
 <!--4EEFB2221A1611DEAEA3001EEC1F37D2--><AD_TEXTINTERFACES>
 <!--4EEFB2221A1611DEAEA3001EEC1F37D2-->  <AD_TEXTINTERFACES_ID><![CDATA[4EEFB2221A1611DEAEA3001EEC1F37D2]]></AD_TEXTINTERFACES_ID>
 <!--4EEFB2221A1611DEAEA3001EEC1F37D2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -17165,16 +16949,16 @@
 <!--50A15104123C424F8671D355DC9844AE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--50A15104123C424F8671D355DC9844AE--></AD_TEXTINTERFACES>
 
-<!--50C9A675ED28466F8F4E7973B9E2E596--><AD_TEXTINTERFACES>
-<!--50C9A675ED28466F8F4E7973B9E2E596-->  <AD_TEXTINTERFACES_ID><![CDATA[50C9A675ED28466F8F4E7973B9E2E596]]></AD_TEXTINTERFACES_ID>
-<!--50C9A675ED28466F8F4E7973B9E2E596-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--50C9A675ED28466F8F4E7973B9E2E596-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--50C9A675ED28466F8F4E7973B9E2E596-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--50C9A675ED28466F8F4E7973B9E2E596-->  <TEXT><![CDATA[SHIPPER]]></TEXT>
-<!--50C9A675ED28466F8F4E7973B9E2E596-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptM_InOut.jrxml]]></FILENAME>
-<!--50C9A675ED28466F8F4E7973B9E2E596-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--50C9A675ED28466F8F4E7973B9E2E596-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--50C9A675ED28466F8F4E7973B9E2E596--></AD_TEXTINTERFACES>
+<!--50AAFE528283409E997BA000F7C61ABF--><AD_TEXTINTERFACES>
+<!--50AAFE528283409E997BA000F7C61ABF-->  <AD_TEXTINTERFACES_ID><![CDATA[50AAFE528283409E997BA000F7C61ABF]]></AD_TEXTINTERFACES_ID>
+<!--50AAFE528283409E997BA000F7C61ABF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--50AAFE528283409E997BA000F7C61ABF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--50AAFE528283409E997BA000F7C61ABF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--50AAFE528283409E997BA000F7C61ABF-->  <TEXT><![CDATA[VOIDED]]></TEXT>
+<!--50AAFE528283409E997BA000F7C61ABF-->  <FILENAME><![CDATA[/org/openbravo/erpReports/C_OrderJR.jrxml]]></FILENAME>
+<!--50AAFE528283409E997BA000F7C61ABF-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--50AAFE528283409E997BA000F7C61ABF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--50AAFE528283409E997BA000F7C61ABF--></AD_TEXTINTERFACES>
 
 <!--520A3E4E01744392BBBD82F6DD1D8A7E--><AD_TEXTINTERFACES>
 <!--520A3E4E01744392BBBD82F6DD1D8A7E-->  <AD_TEXTINTERFACES_ID><![CDATA[520A3E4E01744392BBBD82F6DD1D8A7E]]></AD_TEXTINTERFACES_ID>
@@ -18782,17 +18566,6 @@
 <!--5E3ADBE5A4AE8C5DE040007F01004354-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--5E3ADBE5A4AE8C5DE040007F01004354--></AD_TEXTINTERFACES>
 
-<!--5E3ADBE5A4AF8C5DE040007F01004354--><AD_TEXTINTERFACES>
-<!--5E3ADBE5A4AF8C5DE040007F01004354-->  <AD_TEXTINTERFACES_ID><![CDATA[5E3ADBE5A4AF8C5DE040007F01004354]]></AD_TEXTINTERFACES_ID>
-<!--5E3ADBE5A4AF8C5DE040007F01004354-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--5E3ADBE5A4AF8C5DE040007F01004354-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--5E3ADBE5A4AF8C5DE040007F01004354-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--5E3ADBE5A4AF8C5DE040007F01004354-->  <TEXT><![CDATA[Generated on]]></TEXT>
-<!--5E3ADBE5A4AF8C5DE040007F01004354-->  <FILENAME><![CDATA[/org/openbravo/erpReports/C_OrderJR.jrxml]]></FILENAME>
-<!--5E3ADBE5A4AF8C5DE040007F01004354-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--5E3ADBE5A4AF8C5DE040007F01004354-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--5E3ADBE5A4AF8C5DE040007F01004354--></AD_TEXTINTERFACES>
-
 <!--5E3ADBE5A4B08C5DE040007F01004354--><AD_TEXTINTERFACES>
 <!--5E3ADBE5A4B08C5DE040007F01004354-->  <AD_TEXTINTERFACES_ID><![CDATA[5E3ADBE5A4B08C5DE040007F01004354]]></AD_TEXTINTERFACES_ID>
 <!--5E3ADBE5A4B08C5DE040007F01004354-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -18815,28 +18588,6 @@
 <!--5E3ADBE5A4B18C5DE040007F01004354-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--5E3ADBE5A4B18C5DE040007F01004354--></AD_TEXTINTERFACES>
 
-<!--5E3ADBE5A4B28C5DE040007F01004354--><AD_TEXTINTERFACES>
-<!--5E3ADBE5A4B28C5DE040007F01004354-->  <AD_TEXTINTERFACES_ID><![CDATA[5E3ADBE5A4B28C5DE040007F01004354]]></AD_TEXTINTERFACES_ID>
-<!--5E3ADBE5A4B28C5DE040007F01004354-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--5E3ADBE5A4B28C5DE040007F01004354-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--5E3ADBE5A4B28C5DE040007F01004354-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--5E3ADBE5A4B28C5DE040007F01004354-->  <TEXT><![CDATA[Generated on]]></TEXT>
-<!--5E3ADBE5A4B28C5DE040007F01004354-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptC_OrderPO.jrxml]]></FILENAME>
-<!--5E3ADBE5A4B28C5DE040007F01004354-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--5E3ADBE5A4B28C5DE040007F01004354-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--5E3ADBE5A4B28C5DE040007F01004354--></AD_TEXTINTERFACES>
-
-<!--5E3ADBE5A4B38C5DE040007F01004354--><AD_TEXTINTERFACES>
-<!--5E3ADBE5A4B38C5DE040007F01004354-->  <AD_TEXTINTERFACES_ID><![CDATA[5E3ADBE5A4B38C5DE040007F01004354]]></AD_TEXTINTERFACES_ID>
-<!--5E3ADBE5A4B38C5DE040007F01004354-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--5E3ADBE5A4B38C5DE040007F01004354-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--5E3ADBE5A4B38C5DE040007F01004354-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--5E3ADBE5A4B38C5DE040007F01004354-->  <TEXT><![CDATA[Generated on]]></TEXT>
-<!--5E3ADBE5A4B38C5DE040007F01004354-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptC_Invoice.jrxml]]></FILENAME>
-<!--5E3ADBE5A4B38C5DE040007F01004354-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--5E3ADBE5A4B38C5DE040007F01004354-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--5E3ADBE5A4B38C5DE040007F01004354--></AD_TEXTINTERFACES>
-
 <!--5E3ADBE5A4B48C5DE040007F01004354--><AD_TEXTINTERFACES>
 <!--5E3ADBE5A4B48C5DE040007F01004354-->  <AD_TEXTINTERFACES_ID><![CDATA[5E3ADBE5A4B48C5DE040007F01004354]]></AD_TEXTINTERFACES_ID>
 <!--5E3ADBE5A4B48C5DE040007F01004354-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -18848,6 +18599,17 @@
 <!--5E3ADBE5A4B48C5DE040007F01004354-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--5E3ADBE5A4B48C5DE040007F01004354--></AD_TEXTINTERFACES>
 
+<!--60131D0676FF409BAD9EF1084CA6A6A3--><AD_TEXTINTERFACES>
+<!--60131D0676FF409BAD9EF1084CA6A6A3-->  <AD_TEXTINTERFACES_ID><![CDATA[60131D0676FF409BAD9EF1084CA6A6A3]]></AD_TEXTINTERFACES_ID>
+<!--60131D0676FF409BAD9EF1084CA6A6A3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--60131D0676FF409BAD9EF1084CA6A6A3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--60131D0676FF409BAD9EF1084CA6A6A3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--60131D0676FF409BAD9EF1084CA6A6A3-->  <TEXT><![CDATA[VOIDED]]></TEXT>
+<!--60131D0676FF409BAD9EF1084CA6A6A3-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptM_InOut.jrxml]]></FILENAME>
+<!--60131D0676FF409BAD9EF1084CA6A6A3-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--60131D0676FF409BAD9EF1084CA6A6A3-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--60131D0676FF409BAD9EF1084CA6A6A3--></AD_TEXTINTERFACES>
+
 <!--605A878DC6B5C144E040007F01003147--><AD_TEXTINTERFACES>
 <!--605A878DC6B5C144E040007F01003147-->  <AD_TEXTINTERFACES_ID><![CDATA[605A878DC6B5C144E040007F01003147]]></AD_TEXTINTERFACES_ID>
 <!--605A878DC6B5C144E040007F01003147-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -18947,17 +18709,6 @@
 <!--62B7C7033E06DD2CE040007F01017009-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--62B7C7033E06DD2CE040007F01017009--></AD_TEXTINTERFACES>
 
-<!--63202CC0134B4841804858525065E2A3--><AD_TEXTINTERFACES>
-<!--63202CC0134B4841804858525065E2A3-->  <AD_TEXTINTERFACES_ID><![CDATA[63202CC0134B4841804858525065E2A3]]></AD_TEXTINTERFACES_ID>
-<!--63202CC0134B4841804858525065E2A3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--63202CC0134B4841804858525065E2A3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--63202CC0134B4841804858525065E2A3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--63202CC0134B4841804858525065E2A3-->  <TEXT><![CDATA[Delivery notes]]></TEXT>
-<!--63202CC0134B4841804858525065E2A3-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptM_InOut.jrxml]]></FILENAME>
-<!--63202CC0134B4841804858525065E2A3-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--63202CC0134B4841804858525065E2A3-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--63202CC0134B4841804858525065E2A3--></AD_TEXTINTERFACES>
-
 <!--6333A12831B14D8E990F494A160914B6--><AD_TEXTINTERFACES>
 <!--6333A12831B14D8E990F494A160914B6-->  <AD_TEXTINTERFACES_ID><![CDATA[6333A12831B14D8E990F494A160914B6]]></AD_TEXTINTERFACES_ID>
 <!--6333A12831B14D8E990F494A160914B6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -18980,6 +18731,17 @@
 <!--640C638DCC7942D5858629EC64595C7A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--640C638DCC7942D5858629EC64595C7A--></AD_TEXTINTERFACES>
 
+<!--64F98DD195484D38AC09459D35CF7924--><AD_TEXTINTERFACES>
+<!--64F98DD195484D38AC09459D35CF7924-->  <AD_TEXTINTERFACES_ID><![CDATA[64F98DD195484D38AC09459D35CF7924]]></AD_TEXTINTERFACES_ID>
+<!--64F98DD195484D38AC09459D35CF7924-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--64F98DD195484D38AC09459D35CF7924-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--64F98DD195484D38AC09459D35CF7924-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--64F98DD195484D38AC09459D35CF7924-->  <TEXT><![CDATA[Shimpment Date]]></TEXT>
+<!--64F98DD195484D38AC09459D35CF7924-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptM_InOut.jrxml]]></FILENAME>
+<!--64F98DD195484D38AC09459D35CF7924-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--64F98DD195484D38AC09459D35CF7924-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--64F98DD195484D38AC09459D35CF7924--></AD_TEXTINTERFACES>
+
 <!--650EBAB061AD4E85B236577D313A631E--><AD_TEXTINTERFACES>
 <!--650EBAB061AD4E85B236577D313A631E-->  <AD_TEXTINTERFACES_ID><![CDATA[650EBAB061AD4E85B236577D313A631E]]></AD_TEXTINTERFACES_ID>
 <!--650EBAB061AD4E85B236577D313A631E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -19002,6 +18764,17 @@
 <!--65505548D00711DD9127001D09C4A2FE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--65505548D00711DD9127001D09C4A2FE--></AD_TEXTINTERFACES>
 
+<!--6588547877274B72BD4618FA3C11B5AD--><AD_TEXTINTERFACES>
+<!--6588547877274B72BD4618FA3C11B5AD-->  <AD_TEXTINTERFACES_ID><![CDATA[6588547877274B72BD4618FA3C11B5AD]]></AD_TEXTINTERFACES_ID>
+<!--6588547877274B72BD4618FA3C11B5AD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6588547877274B72BD4618FA3C11B5AD-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6588547877274B72BD4618FA3C11B5AD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6588547877274B72BD4618FA3C11B5AD-->  <TEXT><![CDATA[NET (]]></TEXT>
+<!--6588547877274B72BD4618FA3C11B5AD-->  <FILENAME><![CDATA[/org/openbravo/erpReports/C_OrderLinesJR.jrxml]]></FILENAME>
+<!--6588547877274B72BD4618FA3C11B5AD-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--6588547877274B72BD4618FA3C11B5AD-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6588547877274B72BD4618FA3C11B5AD--></AD_TEXTINTERFACES>
+
 <!--69B61F0276871955E040007F01017873--><AD_TEXTINTERFACES>
 <!--69B61F0276871955E040007F01017873-->  <AD_TEXTINTERFACES_ID><![CDATA[69B61F0276871955E040007F01017873]]></AD_TEXTINTERFACES_ID>
 <!--69B61F0276871955E040007F01017873-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -20443,6 +20216,17 @@
 <!--6E961D44DEFA3D3DE040007F0101642C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6E961D44DEFA3D3DE040007F0101642C--></AD_TEXTINTERFACES>
 
+<!--706C277695FF4A929E64C20FDA703EEE--><AD_TEXTINTERFACES>
+<!--706C277695FF4A929E64C20FDA703EEE-->  <AD_TEXTINTERFACES_ID><![CDATA[706C277695FF4A929E64C20FDA703EEE]]></AD_TEXTINTERFACES_ID>
+<!--706C277695FF4A929E64C20FDA703EEE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--706C277695FF4A929E64C20FDA703EEE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--706C277695FF4A929E64C20FDA703EEE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--706C277695FF4A929E64C20FDA703EEE-->  <TEXT><![CDATA[TOTAL (]]></TEXT>
+<!--706C277695FF4A929E64C20FDA703EEE-->  <FILENAME><![CDATA[/org/openbravo/erpReports/C_OrderLinesJR.jrxml]]></FILENAME>
+<!--706C277695FF4A929E64C20FDA703EEE-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--706C277695FF4A929E64C20FDA703EEE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--706C277695FF4A929E64C20FDA703EEE--></AD_TEXTINTERFACES>
+
 <!--745BED8287B445A4A7E6D7ABEFB14951--><AD_TEXTINTERFACES>
 <!--745BED8287B445A4A7E6D7ABEFB14951-->  <AD_TEXTINTERFACES_ID><![CDATA[745BED8287B445A4A7E6D7ABEFB14951]]></AD_TEXTINTERFACES_ID>
 <!--745BED8287B445A4A7E6D7ABEFB14951-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -20454,6 +20238,17 @@
 <!--745BED8287B445A4A7E6D7ABEFB14951-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--745BED8287B445A4A7E6D7ABEFB14951--></AD_TEXTINTERFACES>
 
+<!--74F9FE001D3644CD918CC41E8218A508--><AD_TEXTINTERFACES>
+<!--74F9FE001D3644CD918CC41E8218A508-->  <AD_TEXTINTERFACES_ID><![CDATA[74F9FE001D3644CD918CC41E8218A508]]></AD_TEXTINTERFACES_ID>
+<!--74F9FE001D3644CD918CC41E8218A508-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--74F9FE001D3644CD918CC41E8218A508-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--74F9FE001D3644CD918CC41E8218A508-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--74F9FE001D3644CD918CC41E8218A508-->  <TEXT><![CDATA[\n]]></TEXT>
+<!--74F9FE001D3644CD918CC41E8218A508-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptC_OrderPO.jrxml]]></FILENAME>
+<!--74F9FE001D3644CD918CC41E8218A508-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--74F9FE001D3644CD918CC41E8218A508-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--74F9FE001D3644CD918CC41E8218A508--></AD_TEXTINTERFACES>
+
 <!--755436B125F81A5AE040007F010176A4--><AD_TEXTINTERFACES>
 <!--755436B125F81A5AE040007F010176A4-->  <AD_TEXTINTERFACES_ID><![CDATA[755436B125F81A5AE040007F010176A4]]></AD_TEXTINTERFACES_ID>
 <!--755436B125F81A5AE040007F010176A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -20498,6 +20293,17 @@
 <!--780F84C2FD1F43C295A2F00A9E9ED4CF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--780F84C2FD1F43C295A2F00A9E9ED4CF--></AD_TEXTINTERFACES>
 
+<!--785FFB121426450187CF1DD4C85A5FD9--><AD_TEXTINTERFACES>
+<!--785FFB121426450187CF1DD4C85A5FD9-->  <AD_TEXTINTERFACES_ID><![CDATA[785FFB121426450187CF1DD4C85A5FD9]]></AD_TEXTINTERFACES_ID>
+<!--785FFB121426450187CF1DD4C85A5FD9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--785FFB121426450187CF1DD4C85A5FD9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--785FFB121426450187CF1DD4C85A5FD9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--785FFB121426450187CF1DD4C85A5FD9-->  <TEXT><![CDATA[\n]]></TEXT>
+<!--785FFB121426450187CF1DD4C85A5FD9-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptC_Invoice.jrxml]]></FILENAME>
+<!--785FFB121426450187CF1DD4C85A5FD9-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--785FFB121426450187CF1DD4C85A5FD9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--785FFB121426450187CF1DD4C85A5FD9--></AD_TEXTINTERFACES>
+
 <!--788BFEB299DB11DDA986001B388C61A4--><AD_TEXTINTERFACES>
 <!--788BFEB299DB11DDA986001B388C61A4-->  <AD_TEXTINTERFACES_ID><![CDATA[788BFEB299DB11DDA986001B388C61A4]]></AD_TEXTINTERFACES_ID>
 <!--788BFEB299DB11DDA986001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -20652,6 +20458,17 @@
 <!--7B5A009499DB11DDA08C001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7B5A009499DB11DDA08C001B388C61A4--></AD_TEXTINTERFACES>
 
+<!--7BA5E381DC604EACA44171419870D348--><AD_TEXTINTERFACES>
+<!--7BA5E381DC604EACA44171419870D348-->  <AD_TEXTINTERFACES_ID><![CDATA[7BA5E381DC604EACA44171419870D348]]></AD_TEXTINTERFACES_ID>
+<!--7BA5E381DC604EACA44171419870D348-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7BA5E381DC604EACA44171419870D348-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7BA5E381DC604EACA44171419870D348-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7BA5E381DC604EACA44171419870D348-->  <TEXT><![CDATA[TOTAL (]]></TEXT>
+<!--7BA5E381DC604EACA44171419870D348-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptC_Invoice_Lines.jrxml]]></FILENAME>
+<!--7BA5E381DC604EACA44171419870D348-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--7BA5E381DC604EACA44171419870D348-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7BA5E381DC604EACA44171419870D348--></AD_TEXTINTERFACES>
+
 <!--7BE423C04CB24023813E5793610FFEE7--><AD_TEXTINTERFACES>
 <!--7BE423C04CB24023813E5793610FFEE7-->  <AD_TEXTINTERFACES_ID><![CDATA[7BE423C04CB24023813E5793610FFEE7]]></AD_TEXTINTERFACES_ID>
 <!--7BE423C04CB24023813E5793610FFEE7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -20685,6 +20502,28 @@
 <!--7CFC4A52410F4B3D95DC8CB809F3B5DD-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7CFC4A52410F4B3D95DC8CB809F3B5DD--></AD_TEXTINTERFACES>
 
+<!--7F033AA20821456B89F3D65729D08970--><AD_TEXTINTERFACES>
+<!--7F033AA20821456B89F3D65729D08970-->  <AD_TEXTINTERFACES_ID><![CDATA[7F033AA20821456B89F3D65729D08970]]></AD_TEXTINTERFACES_ID>
+<!--7F033AA20821456B89F3D65729D08970-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7F033AA20821456B89F3D65729D08970-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7F033AA20821456B89F3D65729D08970-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7F033AA20821456B89F3D65729D08970-->  <TEXT><![CDATA[Receipt No.]]></TEXT>
+<!--7F033AA20821456B89F3D65729D08970-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptM_InOut.jrxml]]></FILENAME>
+<!--7F033AA20821456B89F3D65729D08970-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--7F033AA20821456B89F3D65729D08970-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7F033AA20821456B89F3D65729D08970--></AD_TEXTINTERFACES>
+
+<!--7FE8FB5A56364220AFD4C71D2E2D457B--><AD_TEXTINTERFACES>
+<!--7FE8FB5A56364220AFD4C71D2E2D457B-->  <AD_TEXTINTERFACES_ID><![CDATA[7FE8FB5A56364220AFD4C71D2E2D457B]]></AD_TEXTINTERFACES_ID>
+<!--7FE8FB5A56364220AFD4C71D2E2D457B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7FE8FB5A56364220AFD4C71D2E2D457B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7FE8FB5A56364220AFD4C71D2E2D457B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7FE8FB5A56364220AFD4C71D2E2D457B-->  <TEXT><![CDATA[Receipt Date]]></TEXT>
+<!--7FE8FB5A56364220AFD4C71D2E2D457B-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptM_InOut.jrxml]]></FILENAME>
+<!--7FE8FB5A56364220AFD4C71D2E2D457B-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--7FE8FB5A56364220AFD4C71D2E2D457B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7FE8FB5A56364220AFD4C71D2E2D457B--></AD_TEXTINTERFACES>
+
 <!--7FF3469B9A49B90AE040007F01007549--><AD_TEXTINTERFACES>
 <!--7FF3469B9A49B90AE040007F01007549-->  <AD_TEXTINTERFACES_ID><![CDATA[7FF3469B9A49B90AE040007F01007549]]></AD_TEXTINTERFACES_ID>
 <!--7FF3469B9A49B90AE040007F01007549-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21354,17 +21193,6 @@
 <!--8E2EEBC582974948836ACA2751E8A103-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8E2EEBC582974948836ACA2751E8A103--></AD_TEXTINTERFACES>
 
-<!--91202BC2002F463BA70F989F83DB6721--><AD_TEXTINTERFACES>
-<!--91202BC2002F463BA70F989F83DB6721-->  <AD_TEXTINTERFACES_ID><![CDATA[91202BC2002F463BA70F989F83DB6721]]></AD_TEXTINTERFACES_ID>
-<!--91202BC2002F463BA70F989F83DB6721-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--91202BC2002F463BA70F989F83DB6721-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--91202BC2002F463BA70F989F83DB6721-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--91202BC2002F463BA70F989F83DB6721-->  <TEXT><![CDATA[TEMPERATURE UPON DEPARTURE]]></TEXT>
-<!--91202BC2002F463BA70F989F83DB6721-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptM_InOut.jrxml]]></FILENAME>
-<!--91202BC2002F463BA70F989F83DB6721-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--91202BC2002F463BA70F989F83DB6721-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--91202BC2002F463BA70F989F83DB6721--></AD_TEXTINTERFACES>
-
 <!--9249205697BC413FB680A90F9784D501--><AD_TEXTINTERFACES>
 <!--9249205697BC413FB680A90F9784D501-->  <AD_TEXTINTERFACES_ID><![CDATA[9249205697BC413FB680A90F9784D501]]></AD_TEXTINTERFACES_ID>
 <!--9249205697BC413FB680A90F9784D501-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21475,6 +21303,17 @@
 <!--A37C8063B7A840F4AB09A2E9F426CB65-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--A37C8063B7A840F4AB09A2E9F426CB65--></AD_TEXTINTERFACES>
 
+<!--A4A6B350936342B796F7CFCC0BFCF068--><AD_TEXTINTERFACES>
+<!--A4A6B350936342B796F7CFCC0BFCF068-->  <AD_TEXTINTERFACES_ID><![CDATA[A4A6B350936342B796F7CFCC0BFCF068]]></AD_TEXTINTERFACES_ID>
+<!--A4A6B350936342B796F7CFCC0BFCF068-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A4A6B350936342B796F7CFCC0BFCF068-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A4A6B350936342B796F7CFCC0BFCF068-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A4A6B350936342B796F7CFCC0BFCF068-->  <TEXT><![CDATA[TOTAL (]]></TEXT>
+<!--A4A6B350936342B796F7CFCC0BFCF068-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptC_Invoice.jrxml]]></FILENAME>
+<!--A4A6B350936342B796F7CFCC0BFCF068-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--A4A6B350936342B796F7CFCC0BFCF068-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--A4A6B350936342B796F7CFCC0BFCF068--></AD_TEXTINTERFACES>
+
 <!--A5908A8E2A10405F9F89E8EFE1B530F6--><AD_TEXTINTERFACES>
 <!--A5908A8E2A10405F9F89E8EFE1B530F6-->  <AD_TEXTINTERFACES_ID><![CDATA[A5908A8E2A10405F9F89E8EFE1B530F6]]></AD_TEXTINTERFACES_ID>
 <!--A5908A8E2A10405F9F89E8EFE1B530F6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21486,6 +21325,17 @@
 <!--A5908A8E2A10405F9F89E8EFE1B530F6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--A5908A8E2A10405F9F89E8EFE1B530F6--></AD_TEXTINTERFACES>
 
+<!--A6D474BA1F7E40D1BB40DB73A393B864--><AD_TEXTINTERFACES>
+<!--A6D474BA1F7E40D1BB40DB73A393B864-->  <AD_TEXTINTERFACES_ID><![CDATA[A6D474BA1F7E40D1BB40DB73A393B864]]></AD_TEXTINTERFACES_ID>
+<!--A6D474BA1F7E40D1BB40DB73A393B864-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A6D474BA1F7E40D1BB40DB73A393B864-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A6D474BA1F7E40D1BB40DB73A393B864-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A6D474BA1F7E40D1BB40DB73A393B864-->  <TEXT><![CDATA[PRODUCT NAME]]></TEXT>
+<!--A6D474BA1F7E40D1BB40DB73A393B864-->  <FILENAME><![CDATA[/org/openbravo/erpReports/C_OrderLinesJR.jrxml]]></FILENAME>
+<!--A6D474BA1F7E40D1BB40DB73A393B864-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--A6D474BA1F7E40D1BB40DB73A393B864-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--A6D474BA1F7E40D1BB40DB73A393B864--></AD_TEXTINTERFACES>
+
 <!--A9431A0BF54D40E380277F533EA41425--><AD_TEXTINTERFACES>
 <!--A9431A0BF54D40E380277F533EA41425-->  <AD_TEXTINTERFACES_ID><![CDATA[A9431A0BF54D40E380277F533EA41425]]></AD_TEXTINTERFACES_ID>
 <!--A9431A0BF54D40E380277F533EA41425-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21519,6 +21369,17 @@
 <!--AC7C3DDAFB4A4CD29F38A6D9E9DA3CEE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--AC7C3DDAFB4A4CD29F38A6D9E9DA3CEE--></AD_TEXTINTERFACES>
 
+<!--AD935A21C34B4D4DAB1A214124C25C07--><AD_TEXTINTERFACES>
+<!--AD935A21C34B4D4DAB1A214124C25C07-->  <AD_TEXTINTERFACES_ID><![CDATA[AD935A21C34B4D4DAB1A214124C25C07]]></AD_TEXTINTERFACES_ID>
+<!--AD935A21C34B4D4DAB1A214124C25C07-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--AD935A21C34B4D4DAB1A214124C25C07-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--AD935A21C34B4D4DAB1A214124C25C07-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--AD935A21C34B4D4DAB1A214124C25C07-->  <TEXT><![CDATA[PRODUCT NAME]]></TEXT>
+<!--AD935A21C34B4D4DAB1A214124C25C07-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptC_Invoice_Lines.jrxml]]></FILENAME>
+<!--AD935A21C34B4D4DAB1A214124C25C07-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--AD935A21C34B4D4DAB1A214124C25C07-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--AD935A21C34B4D4DAB1A214124C25C07--></AD_TEXTINTERFACES>
+
 <!--AE7B8660F2B811DDA8F4001D09C4A2FE--><AD_TEXTINTERFACES>
 <!--AE7B8660F2B811DDA8F4001D09C4A2FE-->  <AD_TEXTINTERFACES_ID><![CDATA[AE7B8660F2B811DDA8F4001D09C4A2FE]]></AD_TEXTINTERFACES_ID>
 <!--AE7B8660F2B811DDA8F4001D09C4A2FE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21541,6 +21402,17 @@
 <!--AEB4114777D14A2988B8937F98CAFA16-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--AEB4114777D14A2988B8937F98CAFA16--></AD_TEXTINTERFACES>
 
+<!--AECD67A7CDC244E6B79B901B30B824AC--><AD_TEXTINTERFACES>
+<!--AECD67A7CDC244E6B79B901B30B824AC-->  <AD_TEXTINTERFACES_ID><![CDATA[AECD67A7CDC244E6B79B901B30B824AC]]></AD_TEXTINTERFACES_ID>
+<!--AECD67A7CDC244E6B79B901B30B824AC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--AECD67A7CDC244E6B79B901B30B824AC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--AECD67A7CDC244E6B79B901B30B824AC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--AECD67A7CDC244E6B79B901B30B824AC-->  <TEXT><![CDATA[BASE (]]></TEXT>
+<!--AECD67A7CDC244E6B79B901B30B824AC-->  <FILENAME><![CDATA[/org/openbravo/erpReports/C_OrderLinesJR.jrxml]]></FILENAME>
+<!--AECD67A7CDC244E6B79B901B30B824AC-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--AECD67A7CDC244E6B79B901B30B824AC-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--AECD67A7CDC244E6B79B901B30B824AC--></AD_TEXTINTERFACES>
+
 <!--B0310282628911DE8D8512313C002DE1--><AD_TEXTINTERFACES>
 <!--B0310282628911DE8D8512313C002DE1-->  <AD_TEXTINTERFACES_ID><![CDATA[B0310282628911DE8D8512313C002DE1]]></AD_TEXTINTERFACES_ID>
 <!--B0310282628911DE8D8512313C002DE1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21596,6 +21468,17 @@
 <!--B27875A650D346818A369FD0F2A7AFF8-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--B27875A650D346818A369FD0F2A7AFF8--></AD_TEXTINTERFACES>
 
+<!--B9FE576F39B34B66BAEC1A638B1ADA59--><AD_TEXTINTERFACES>
+<!--B9FE576F39B34B66BAEC1A638B1ADA59-->  <AD_TEXTINTERFACES_ID><![CDATA[B9FE576F39B34B66BAEC1A638B1ADA59]]></AD_TEXTINTERFACES_ID>
+<!--B9FE576F39B34B66BAEC1A638B1ADA59-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B9FE576F39B34B66BAEC1A638B1ADA59-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B9FE576F39B34B66BAEC1A638B1ADA59-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B9FE576F39B34B66BAEC1A638B1ADA59-->  <TEXT><![CDATA[\n]]></TEXT>
+<!--B9FE576F39B34B66BAEC1A638B1ADA59-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptM_InOut.jrxml]]></FILENAME>
+<!--B9FE576F39B34B66BAEC1A638B1ADA59-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--B9FE576F39B34B66BAEC1A638B1ADA59-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B9FE576F39B34B66BAEC1A638B1ADA59--></AD_TEXTINTERFACES>
+
 <!--BBF8472FF8784BFEBE792346154E0455--><AD_TEXTINTERFACES>
 <!--BBF8472FF8784BFEBE792346154E0455-->  <AD_TEXTINTERFACES_ID><![CDATA[BBF8472FF8784BFEBE792346154E0455]]></AD_TEXTINTERFACES_ID>
 <!--BBF8472FF8784BFEBE792346154E0455-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21640,6 +21523,17 @@
 <!--C68BD2CAFFA6451391940FEEE0928CE7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--C68BD2CAFFA6451391940FEEE0928CE7--></AD_TEXTINTERFACES>
 
+<!--C837F384C7CD4ED390D2319D0B891438--><AD_TEXTINTERFACES>
+<!--C837F384C7CD4ED390D2319D0B891438-->  <AD_TEXTINTERFACES_ID><![CDATA[C837F384C7CD4ED390D2319D0B891438]]></AD_TEXTINTERFACES_ID>
+<!--C837F384C7CD4ED390D2319D0B891438-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C837F384C7CD4ED390D2319D0B891438-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C837F384C7CD4ED390D2319D0B891438-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C837F384C7CD4ED390D2319D0B891438-->  <TEXT><![CDATA[ATTRIBUTES]]></TEXT>
+<!--C837F384C7CD4ED390D2319D0B891438-->  <FILENAME><![CDATA[/org/openbravo/erpReports/Rptm_InOut_Lines.jrxml]]></FILENAME>
+<!--C837F384C7CD4ED390D2319D0B891438-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--C837F384C7CD4ED390D2319D0B891438-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--C837F384C7CD4ED390D2319D0B891438--></AD_TEXTINTERFACES>
+
 <!--CAEEEC9A2E9211DE8D72001CC0B8E31F--><AD_TEXTINTERFACES>
 <!--CAEEEC9A2E9211DE8D72001CC0B8E31F-->  <AD_TEXTINTERFACES_ID><![CDATA[CAEEEC9A2E9211DE8D72001CC0B8E31F]]></AD_TEXTINTERFACES_ID>
 <!--CAEEEC9A2E9211DE8D72001CC0B8E31F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21750,6 +21644,17 @@
 <!--D69AA41C4E364F7385E8A4CC0C7E470F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--D69AA41C4E364F7385E8A4CC0C7E470F--></AD_TEXTINTERFACES>
 
+<!--DA5CFE5AA7774C44BC4BED39944402DD--><AD_TEXTINTERFACES>
+<!--DA5CFE5AA7774C44BC4BED39944402DD-->  <AD_TEXTINTERFACES_ID><![CDATA[DA5CFE5AA7774C44BC4BED39944402DD]]></AD_TEXTINTERFACES_ID>
+<!--DA5CFE5AA7774C44BC4BED39944402DD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DA5CFE5AA7774C44BC4BED39944402DD-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DA5CFE5AA7774C44BC4BED39944402DD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DA5CFE5AA7774C44BC4BED39944402DD-->  <TEXT><![CDATA[PRICE (]]></TEXT>
+<!--DA5CFE5AA7774C44BC4BED39944402DD-->  <FILENAME><![CDATA[/org/openbravo/erpReports/C_OrderLinesJR.jrxml]]></FILENAME>
+<!--DA5CFE5AA7774C44BC4BED39944402DD-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--DA5CFE5AA7774C44BC4BED39944402DD-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--DA5CFE5AA7774C44BC4BED39944402DD--></AD_TEXTINTERFACES>
+
 <!--DB6ED88B022A4803A61DD0096917F972--><AD_TEXTINTERFACES>
 <!--DB6ED88B022A4803A61DD0096917F972-->  <AD_TEXTINTERFACES_ID><![CDATA[DB6ED88B022A4803A61DD0096917F972]]></AD_TEXTINTERFACES_ID>
 <!--DB6ED88B022A4803A61DD0096917F972-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21761,16 +21666,27 @@
 <!--DB6ED88B022A4803A61DD0096917F972-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--DB6ED88B022A4803A61DD0096917F972--></AD_TEXTINTERFACES>
 
-<!--E0528C2BC19F413BA7AD6FDEFCBCE890--><AD_TEXTINTERFACES>
-<!--E0528C2BC19F413BA7AD6FDEFCBCE890-->  <AD_TEXTINTERFACES_ID><![CDATA[E0528C2BC19F413BA7AD6FDEFCBCE890]]></AD_TEXTINTERFACES_ID>
-<!--E0528C2BC19F413BA7AD6FDEFCBCE890-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--E0528C2BC19F413BA7AD6FDEFCBCE890-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--E0528C2BC19F413BA7AD6FDEFCBCE890-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--E0528C2BC19F413BA7AD6FDEFCBCE890-->  <TEXT><![CDATA[Received and conformed, customer: (signature and stamp)]]></TEXT>
-<!--E0528C2BC19F413BA7AD6FDEFCBCE890-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptM_InOut.jrxml]]></FILENAME>
-<!--E0528C2BC19F413BA7AD6FDEFCBCE890-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--E0528C2BC19F413BA7AD6FDEFCBCE890-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--E0528C2BC19F413BA7AD6FDEFCBCE890--></AD_TEXTINTERFACES>
+<!--DD99CE7A10704467BA47244582B45F7D--><AD_TEXTINTERFACES>
+<!--DD99CE7A10704467BA47244582B45F7D-->  <AD_TEXTINTERFACES_ID><![CDATA[DD99CE7A10704467BA47244582B45F7D]]></AD_TEXTINTERFACES_ID>
+<!--DD99CE7A10704467BA47244582B45F7D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DD99CE7A10704467BA47244582B45F7D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DD99CE7A10704467BA47244582B45F7D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DD99CE7A10704467BA47244582B45F7D-->  <TEXT><![CDATA[PRICE (]]></TEXT>
+<!--DD99CE7A10704467BA47244582B45F7D-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptC_Invoice_Lines.jrxml]]></FILENAME>
+<!--DD99CE7A10704467BA47244582B45F7D-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--DD99CE7A10704467BA47244582B45F7D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--DD99CE7A10704467BA47244582B45F7D--></AD_TEXTINTERFACES>
+
+<!--E061FC68EEE84521AAC366955C17ED7A--><AD_TEXTINTERFACES>
+<!--E061FC68EEE84521AAC366955C17ED7A-->  <AD_TEXTINTERFACES_ID><![CDATA[E061FC68EEE84521AAC366955C17ED7A]]></AD_TEXTINTERFACES_ID>
+<!--E061FC68EEE84521AAC366955C17ED7A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E061FC68EEE84521AAC366955C17ED7A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E061FC68EEE84521AAC366955C17ED7A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E061FC68EEE84521AAC366955C17ED7A-->  <TEXT><![CDATA[PRICE(]]></TEXT>
+<!--E061FC68EEE84521AAC366955C17ED7A-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptC_OrderPO_Lines.jrxml]]></FILENAME>
+<!--E061FC68EEE84521AAC366955C17ED7A-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--E061FC68EEE84521AAC366955C17ED7A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--E061FC68EEE84521AAC366955C17ED7A--></AD_TEXTINTERFACES>
 
 <!--E228440A042711DE90B03B18C9F4D4A2--><AD_TEXTINTERFACES>
 <!--E228440A042711DE90B03B18C9F4D4A2-->  <AD_TEXTINTERFACES_ID><![CDATA[E228440A042711DE90B03B18C9F4D4A2]]></AD_TEXTINTERFACES_ID>
@@ -21992,16 +21908,16 @@
 <!--F0B9ADCB141448518983E230FF36A303-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--F0B9ADCB141448518983E230FF36A303--></AD_TEXTINTERFACES>
 
-<!--F1A32847CB5B4A6484846F92F9D7AFD0--><AD_TEXTINTERFACES>
-<!--F1A32847CB5B4A6484846F92F9D7AFD0-->  <AD_TEXTINTERFACES_ID><![CDATA[F1A32847CB5B4A6484846F92F9D7AFD0]]></AD_TEXTINTERFACES_ID>
-<!--F1A32847CB5B4A6484846F92F9D7AFD0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--F1A32847CB5B4A6484846F92F9D7AFD0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--F1A32847CB5B4A6484846F92F9D7AFD0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--F1A32847CB5B4A6484846F92F9D7AFD0-->  <TEXT><![CDATA[LOT]]></TEXT>
-<!--F1A32847CB5B4A6484846F92F9D7AFD0-->  <FILENAME><![CDATA[/org/openbravo/erpReports/Rptm_InOut_Lines.jrxml]]></FILENAME>
-<!--F1A32847CB5B4A6484846F92F9D7AFD0-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--F1A32847CB5B4A6484846F92F9D7AFD0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--F1A32847CB5B4A6484846F92F9D7AFD0--></AD_TEXTINTERFACES>
+<!--F1545D2619E44D6FB6B04985E5C6B049--><AD_TEXTINTERFACES>
+<!--F1545D2619E44D6FB6B04985E5C6B049-->  <AD_TEXTINTERFACES_ID><![CDATA[F1545D2619E44D6FB6B04985E5C6B049]]></AD_TEXTINTERFACES_ID>
+<!--F1545D2619E44D6FB6B04985E5C6B049-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F1545D2619E44D6FB6B04985E5C6B049-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F1545D2619E44D6FB6B04985E5C6B049-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F1545D2619E44D6FB6B04985E5C6B049-->  <TEXT><![CDATA[TOTAL (WITHOUT TAXES):]]></TEXT>
+<!--F1545D2619E44D6FB6B04985E5C6B049-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptC_Invoice_Lines.jrxml]]></FILENAME>
+<!--F1545D2619E44D6FB6B04985E5C6B049-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--F1545D2619E44D6FB6B04985E5C6B049-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F1545D2619E44D6FB6B04985E5C6B049--></AD_TEXTINTERFACES>
 
 <!--F2629375303C4AA48FC9FFB0494D1004--><AD_TEXTINTERFACES>
 <!--F2629375303C4AA48FC9FFB0494D1004-->  <AD_TEXTINTERFACES_ID><![CDATA[F2629375303C4AA48FC9FFB0494D1004]]></AD_TEXTINTERFACES_ID>
@@ -22069,17 +21985,6 @@
 <!--F98F06E6DAE64D86862F2E5FB3AF5D64-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--F98F06E6DAE64D86862F2E5FB3AF5D64--></AD_TEXTINTERFACES>
 
-<!--F9C880092D094F9391E5DE38649FEAB7--><AD_TEXTINTERFACES>
-<!--F9C880092D094F9391E5DE38649FEAB7-->  <AD_TEXTINTERFACES_ID><![CDATA[F9C880092D094F9391E5DE38649FEAB7]]></AD_TEXTINTERFACES_ID>
-<!--F9C880092D094F9391E5DE38649FEAB7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--F9C880092D094F9391E5DE38649FEAB7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--F9C880092D094F9391E5DE38649FEAB7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--F9C880092D094F9391E5DE38649FEAB7-->  <TEXT><![CDATA[Cust. code]]></TEXT>
-<!--F9C880092D094F9391E5DE38649FEAB7-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptM_InOut.jrxml]]></FILENAME>
-<!--F9C880092D094F9391E5DE38649FEAB7-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--F9C880092D094F9391E5DE38649FEAB7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--F9C880092D094F9391E5DE38649FEAB7--></AD_TEXTINTERFACES>
-
 <!--FA33B0B0706A40518FDF1F20F973826B--><AD_TEXTINTERFACES>
 <!--FA33B0B0706A40518FDF1F20F973826B-->  <AD_TEXTINTERFACES_ID><![CDATA[FA33B0B0706A40518FDF1F20F973826B]]></AD_TEXTINTERFACES_ID>
 <!--FA33B0B0706A40518FDF1F20F973826B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -22102,4 +22007,26 @@
 <!--FB62B1323B604E6CBEDDB554D2E4447F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--FB62B1323B604E6CBEDDB554D2E4447F--></AD_TEXTINTERFACES>
 
+<!--FC4FFBDCC6AE4BE4B4048E8ACD73E91A--><AD_TEXTINTERFACES>
+<!--FC4FFBDCC6AE4BE4B4048E8ACD73E91A-->  <AD_TEXTINTERFACES_ID><![CDATA[FC4FFBDCC6AE4BE4B4048E8ACD73E91A]]></AD_TEXTINTERFACES_ID>
+<!--FC4FFBDCC6AE4BE4B4048E8ACD73E91A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FC4FFBDCC6AE4BE4B4048E8ACD73E91A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FC4FFBDCC6AE4BE4B4048E8ACD73E91A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FC4FFBDCC6AE4BE4B4048E8ACD73E91A-->  <TEXT><![CDATA[VO]]></TEXT>
+<!--FC4FFBDCC6AE4BE4B4048E8ACD73E91A-->  <FILENAME><![CDATA[/org/openbravo/erpReports/RptC_OrderPO.jrxml]]></FILENAME>
+<!--FC4FFBDCC6AE4BE4B4048E8ACD73E91A-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--FC4FFBDCC6AE4BE4B4048E8ACD73E91A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FC4FFBDCC6AE4BE4B4048E8ACD73E91A--></AD_TEXTINTERFACES>
+
+<!--FCDE492F181D47A8A87B93F89C18C831--><AD_TEXTINTERFACES>
+<!--FCDE492F181D47A8A87B93F89C18C831-->  <AD_TEXTINTERFACES_ID><![CDATA[FCDE492F181D47A8A87B93F89C18C831]]></AD_TEXTINTERFACES_ID>
+<!--FCDE492F181D47A8A87B93F89C18C831-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FCDE492F181D47A8A87B93F89C18C831-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FCDE492F181D47A8A87B93F89C18C831-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FCDE492F181D47A8A87B93F89C18C831-->  <TEXT><![CDATA[PRODUCT NAME]]></TEXT>
+<!--FCDE492F181D47A8A87B93F89C18C831-->  <FILENAME><![CDATA[/org/openbravo/erpReports/Rptm_InOut_Lines.jrxml]]></FILENAME>
+<!--FCDE492F181D47A8A87B93F89C18C831-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--FCDE492F181D47A8A87B93F89C18C831-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FCDE492F181D47A8A87B93F89C18C831--></AD_TEXTINTERFACES>
+
 </data>
--- a/src-test/org/openbravo/test/dal/IssuesTest.java	Thu Jul 29 16:10:28 2010 +0200
+++ b/src-test/org/openbravo/test/dal/IssuesTest.java	Mon Aug 02 08:18:10 2010 +0200
@@ -24,7 +24,10 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.log4j.Logger;
 import org.dom4j.Document;
@@ -44,6 +47,7 @@
 import org.openbravo.model.ad.access.Role;
 import org.openbravo.model.ad.access.User;
 import org.openbravo.model.ad.module.Module;
+import org.openbravo.model.ad.process.ProcessInstance;
 import org.openbravo.model.ad.system.Client;
 import org.openbravo.model.ad.system.Language;
 import org.openbravo.model.ad.ui.Form;
@@ -54,6 +58,7 @@
 import org.openbravo.model.common.invoice.InvoiceLine;
 import org.openbravo.model.common.order.Order;
 import org.openbravo.model.common.plm.Product;
+import org.openbravo.service.db.CallProcess;
 import org.openbravo.service.db.CallStoredProcedure;
 import org.openbravo.test.base.BaseTest;
 
@@ -112,6 +117,24 @@
   private static final Logger log = Logger.getLogger(IssuesTest.class);
 
   /**
+   * https://issues.openbravo.com/view.php?id=13749
+   */
+  public void test13749() {
+    setBigBazaarAdminContext();
+    try {
+      org.openbravo.model.ad.ui.Process process = OBDal.getInstance().get(
+          org.openbravo.model.ad.ui.Process.class, "1004400000"); // Has a Date parameter
+      Map<String, Date> params = new HashMap<String, Date>();
+      params.put("DateOrdered", new Date());
+      ProcessInstance pi = CallProcess.getInstance().callProcess(process, null, params);
+      log.info("Result: " + pi.getResult());
+      log.info("Error message: " + pi.getErrorMsg());
+    } catch (Exception e) {
+      log.error("Error testing CallProcess: " + e.getMessage(), e);
+    }
+  }
+
+  /**
    * https://issues.openbravo.com/view.php?id=12918
    */
   public void test12918() {
--- a/src-util/buildvalidation/build.xml	Thu Jul 29 16:10:28 2010 +0200
+++ b/src-util/buildvalidation/build.xml	Mon Aug 02 08:18:10 2010 +0200
@@ -99,7 +99,7 @@
   <target name="compile" depends="checkmodule, sqlcCore, sqlcModules, javacCore, javacModule">
   </target>
 
-  <target name="buildvalidation" >
+  <target name="buildvalidation" if="buildValidation.var">
     <java classname="org.openbravo.buildvalidation.BuildValidationHandler" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}" failonerror="yes">
       <arg value="${base.src}/../"/>
       <arg value="${module}"/>
Binary file src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/Cbpvendoracct.class has changed
Binary file src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/CbpvendoracctData.class has changed
--- a/src-util/buildvalidation/src/org/openbravo/buildvalidation/Cbpvendoracct.java	Thu Jul 29 16:10:28 2010 +0200
+++ b/src-util/buildvalidation/src/org/openbravo/buildvalidation/Cbpvendoracct.java	Mon Aug 02 08:18:10 2010 +0200
@@ -23,6 +23,7 @@
 
 import org.openbravo.database.ConnectionProvider;
 
+
 /**
  * This validation is related to this issue: https://issues.openbravo.com/view.php?id=12824 The
  * unique constraint C_BP_VENDOR_ACCT_ACCTSCHEMA_UN was made more restrictive, and it will fail if
@@ -39,12 +40,44 @@
       int b = Integer.parseInt(CbpvendoracctData.countDistinct(cp));
       if (a != b) {
         errors
-            .add("Due to a database constraint modification, is no longer allowed to have more than one entry in business partner -> vendor -> accounting tab, for the same accounting schema and status. In previous releases, one per organization was allowed, but is not the case now. There exists data in your database that do not fit this new constraint. Please fix it before updating the database.");
+            .add("You can not apply this MP because your instance fails in a pre-validation: from Openbravo 2.50 MP18 it is not allowed to have more than one entry in business partner ->  vendor ->  accounting tab with the same accounting schema and status. Untill MP18 it was allowed although it was wrong since the behaviour was unpredictable: any of the duplicated accounts could be used for the accounting of that business partner. To fix this problem in your instance, you can know the duplicated entries by reviewing Alerts in your system (Alert Rule: Vendor Duplicate Accounts). Once you find the duplicated entries you should remove the wrong ones. Once it is fixed you should be able to apply this MP.");
+	String alertRuleId = CbpvendoracctData.getUUID(cp);
+	if (CbpvendoracctData.existsAlertRule(cp).equals("0")){
+	  CbpvendoracctData.insertAlertRule(cp, alertRuleId);
+	  processAlert(alertRuleId, cp);
+	}
       }
     } catch (Exception e) {
       return handleError(e);
     }
     return errors;
   }
+  /**
+   * @param alertRule
+   * @param conn
+   * @throws Exception
+   */
+  private void processAlert(String adAlertruleId, ConnectionProvider cp) throws Exception {
+    CbpvendoracctData[] alertRule = CbpvendoracctData.select(cp, adAlertruleId);
+    CbpvendoracctData[] alert = null;
+    if (!alertRule[0].sql.equals("")) {
+      try {
+        alert = CbpvendoracctData.selectAlert(cp, alertRule[0].sql);
+      } catch (Exception ex) {
+        return;
+      }
+    }
+    // Insert
+    if (alert != null && alert.length != 0) {
+      StringBuilder msg = new StringBuilder();
+      ;
+
+      for (int i = 0; i < alert.length; i++) {
+        if (CbpvendoracctData.existsReference(cp, adAlertruleId, alert[i].referencekeyId).equals("0")) {
+          CbpvendoracctData.insertAlert(cp, alert[i].description, alertRule[0].adAlertruleId, alert[i].recordId, alert[i].referencekeyId);
+        }
+      }
+    }
+  }
 
 }
--- a/src-util/buildvalidation/src/org/openbravo/buildvalidation/Cbpvendoracct_data.xsql	Thu Jul 29 16:10:28 2010 +0200
+++ b/src-util/buildvalidation/src/org/openbravo/buildvalidation/Cbpvendoracct_data.xsql	Mon Aug 02 08:18:10 2010 +0200
@@ -20,6 +20,56 @@
 
 
 <SqlClass name="CbpvendoracctData" package="org.openbravo.buildvalidation">
+   <SqlMethod name="select" type="preparedStatement" return="multiple">
+      <SqlMethodComment></SqlMethodComment>
+      <Sql><![CDATA[
+        SELECT  AD_CLIENT_ID,
+                AD_ORG_ID,
+                CREATED,
+                CREATEDBY,
+                UPDATED,
+                UPDATEDBY,
+                ISACTIVE, 
+                '' as RECORD_ID,
+                '' as DESCRIPTION,
+                '' as REFERENCEKEY_ID, 
+                '' as AD_ROLE_ID, 
+                AD_ALERTRULE_ID,
+                SQL,
+                NAME
+          FROM AD_ALERTRULE
+	  WHERE AD_ALERTRULE_ID = ?
+    ]]></Sql>
+      <Parameter name="alertRule"/>
+   </SqlMethod>
+   <SqlMethod name="existsAlertRule" type="preparedStatement" return="string">
+      <SqlMethodComment></SqlMethodComment>
+      <Sql><![CDATA[
+          SELECT COUNT(*) AS EXISTING
+            FROM AD_ALERTRULE
+           WHERE NAME LIKE 'Vendor Duplicate Accounts'
+             AND ISACTIVE = 'Y'
+      ]]></Sql>
+   </SqlMethod>
+   <SqlMethod name="existsReference" type="preparedStatement" return="string">
+      <SqlMethodComment></SqlMethodComment>
+      <Sql><![CDATA[
+          SELECT COUNT(*) AS EXISTING
+            FROM AD_ALERT
+           WHERE AD_ALERTRULE_ID = ?
+             AND REFERENCEKEY_ID = ?
+             AND ISACTIVE = 'Y'
+      ]]></Sql>
+      <Parameter name="alertRule"/>
+      <Parameter name="ref"/>      
+   </SqlMethod>
+   <SqlMethod name="getUUID" type="preparedStatement" return="string">
+      <SqlMethodComment></SqlMethodComment>
+      <Sql><![CDATA[
+          SELECT get_uuid()
+            FROM dual
+      ]]></Sql>
+   </SqlMethod>
   <SqlMethod name="countNoDistinct" type="preparedStatement" return="string">
       <SqlMethodComment>This query counts the number of rows in c_bp_vendor_acct</SqlMethodComment>
       <Sql><![CDATA[
@@ -34,4 +84,53 @@
           ]]>
       </Sql>
   </SqlMethod>
+  <SqlMethod name="insertAlertRule" type="preparedStatement" return="rowcount">
+      <SqlMethodComment></SqlMethodComment>
+      <Sql><![CDATA[
+         INSERT INTO AD_ALERTRULE (
+    AD_ALERTRULE_ID,
+    AD_CLIENT_ID   ,
+    AD_ORG_ID      ,
+    ISACTIVE       ,
+    CREATED        ,
+    CREATEDBY      ,
+    UPDATED        ,
+    UPDATEDBY      ,
+    NAME           ,
+    AD_TAB_ID      ,
+    FILTERCLAUSE   ,
+    SQL            ,
+    TYPE
+  )
+  VALUES (?, '0', '0', 'Y', now(), '100', now(), '100', 'Vendor Duplicate Accounts', '213', '', 
+  'select max(c_bp_vendor_acct_id) as referencekey_id, ad_column_identifier(''C_BP_Vendor_Acct'',max(C_BP_Vendor_Acct_ID),''en_US'') as record_id, 0 as ad_role_id, null as ad_user_id, ''Duplicated accounting Configuration entry. Please ensure just one entry exists per accounting schema and status for this business partner'' as description, ''Y'' as isActive, max(ad_org_id), max(ad_client_id), now() as created, 0 as createdBy,  now() as updated, 0 as updatedBy  from c_bp_vendor_acct p group by c_acctschema_id, c_bpartner_id, status having count(c_bp_vendor_acct_id)>1'
+  , 'D')
+          ]]>
+      </Sql>
+    <Parameter name="alertRuleId"/>
+  </SqlMethod>
+   <SqlMethod name="insertAlert" type="preparedStatement"
+   	return="rowcount">
+   	<SqlMethodComment></SqlMethodComment>
+   	<Sql>
+   		<![CDATA[
+       INSERT INTO AD_Alert (AD_Alert_ID, AD_Client_ID, AD_Org_ID, IsActive, 
+                      Created, CreatedBy, Updated, UpdatedBy, Description, AD_AlertRule_ID, Record_Id, Referencekey_ID)
+      		VALUES (get_uuid(), '0', '0', 'Y', NOW(), '0', NOW(), '0', ?, ?, ?, ?)
+      ]]>
+   	</Sql>
+   	<Parameter name="description" />
+   	<Parameter name="adAlertRuleId" />
+   	<Parameter name="recordId" />
+   	<Parameter name="referencekey_id" />
+   </SqlMethod>
+   
+   <SqlMethod name="selectAlert" type="preparedStatement" return="multiple">
+      <SqlMethodComment></SqlMethodComment>
+      <Sql><![CDATA[
+          SELECT AAA.* 
+            FROM (SELECT '' AS DESCRIPTION, '' AS RECORD_ID, '' AS REFERENCEKEY_ID FROM DUAL) AAA 
+      ]]></Sql>
+      <Parameter name="sql" type="replace" optional="true" after="FROM (" text="SELECT '' AS DESCRIPTION, '' AS RECORD_ID, '' AS REFERENCEKEY_ID FROM DUAL"/>
+   </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql	Thu Jul 29 16:10:28 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql	Mon Aug 02 08:18:10 2010 +0200
@@ -114,12 +114,13 @@
     <Sql>
       <![CDATA[
         SELECT o.C_ORDER_ID as ID, Ad_Column_Identifier(to_char('C_Order'), to_char(o.c_order_id), to_char(?)) AS NAME 
-        FROM C_INVOICE_CANDIDATE_V ic, C_ORDER o 
+        FROM C_INVOICE_CANDIDATE_V ic, C_ORDER o
         WHERE o.C_ORDER_ID = ic.C_ORDER_ID 
         AND ic.AD_Client_ID IN ('1') 
         AND ic.AD_Org_ID IN ('1') 
         AND ic.C_BPartner_ID = ? 
-        AND ((ic.term = 'D' AND ic.qtydelivered <>0) OR (ic.term = 'I') OR (ic.term <> 'N' AND (ic.term IN ('O','S') AND (ic.qtyordered = ic.qtydelivered) )) )
+        AND o.C_Order_Id = ic.C_Order_Id
+        AND ((ic.term = 'D' AND ic.qtydelivered <>0) OR (ic.term = 'I' AND (SELECT SUM(ol.QTYORDERED)-SUM(ol.QTYINVOICED) FROM C_ORDERLINE ol WHERE ol.C_ORDER_ID = o.C_ORDER_ID) <> 0) OR (ic.term <> 'N' AND (ic.term IN ('O','S') AND (ic.qtyordered = ic.qtydelivered) )) )
         GROUP BY o.C_ORDER_ID, o.DocumentNo, o.DateOrdered, o.GrandTotal 
         ORDER BY NAME
       ]]>
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Product.java	Thu Jul 29 16:10:28 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Product.java	Mon Aug 02 08:18:10 2010 +0200
@@ -29,6 +29,7 @@
 import org.openbravo.base.secureApp.HttpSecureAppServlet;
 import org.openbravo.base.secureApp.VariablesSecureApp;
 import org.openbravo.data.FieldProvider;
+import org.openbravo.erpCommon.businessUtility.OrganizationData;
 import org.openbravo.erpCommon.businessUtility.PAttributeSet;
 import org.openbravo.erpCommon.businessUtility.PAttributeSetData;
 import org.openbravo.erpCommon.businessUtility.Tax;
@@ -65,6 +66,13 @@
       String strWindowId = vars.getStringParameter("inpwindowId");
       String strIsSOTrx = Utility.getContext(this, vars, "isSOTrx", strWindowId);
       String strWharehouse = Utility.getContext(this, vars, "#M_Warehouse_ID", strWindowId);
+      String strWarehouseOrg = SLOrderProductData.getWarehouseOrg(this, strWharehouse);
+      String strWarehouseForOrg = "";
+      if (!OrganizationData.isOrgInTree(this, strADOrgID, strWarehouseOrg, vars.getClient()))
+        strWarehouseForOrg = SLOrderProductData.getWarehouseOfOrg(this, vars.getClient(),
+            strADOrgID);
+      if (!strWarehouseForOrg.equals(""))
+        strWharehouse = strWarehouseForOrg;
       String strTabId = vars.getStringParameter("inpTabId");
 
       try {
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Order_Product_data.xsql	Thu Jul 29 16:10:28 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Order_Product_data.xsql	Mon Aug 02 08:18:10 2010 +0200
@@ -147,4 +147,33 @@
      <Parameter name="adUserClient" type="replace" optional="true" after="AD_Client_ID IN (" text="'1'"/>
      <Parameter name="adUserOrg" type="replace" optional="true" after="AD_Org_ID IN (" text="'1'"/>
   </SqlMethod>
+
+  <SqlMethod name="getWarehouseOrg" type="preparedStatement" return="String">
+    <SqlMethodComment></SqlMethodComment>
+    <Sql>
+	  SELECT AD_ORG_ID
+      FROM M_WAREHOUSE
+      WHERE M_WAREHOUSE_ID = ?
+	 </Sql>
+    <Parameter name="cWarehouseID"/>
+  </SqlMethod>
+
+  <SqlMethod name="getWarehouseOfOrg" type="preparedStatement" return="String">
+    <SqlMethodComment></SqlMethodComment>
+    <Sql>
+      <![CDATA[
+        select min(w.m_warehouse_id)
+        from m_warehouse w
+        where w.ad_client_id=?
+          and (ad_isorgincluded(?,w.ad_org_id,?)<>-1
+            or ad_isorgincluded(w.ad_org_id,?,?)<>-1)
+      ]]>
+    </Sql>
+    <Parameter name="adClientId"/>
+    <Parameter name="adOrgId"/>
+    <Parameter name="adClientId"/>
+    <Parameter name="adOrgId"/>
+    <Parameter name="adClientId"/>
+  </SqlMethod>
+
 </SqlClass>
--- a/src/org/openbravo/erpCommon/ad_forms/AcctServer.java	Thu Jul 29 16:10:28 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/AcctServer.java	Mon Aug 02 08:18:10 2010 +0200
@@ -1670,14 +1670,14 @@
     return false;
   } // end of checkDocuments() method
 
-  void setMessageResult(OBError error) {
+  public void setMessageResult(OBError error) {
     messageResult = error;
   }
 
   /*
    * Sets OBError message for the given status
    */
-  void setMessageResult(ConnectionProvider conn, VariablesSecureApp vars, String strStatus,
+  public void setMessageResult(ConnectionProvider conn, VariablesSecureApp vars, String strStatus,
       String strMessageType) {
     if (strStatus == null || strStatus.equals(""))
       strStatus = getStatus();
--- a/src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual_data.xsql	Thu Jul 29 16:10:28 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual_data.xsql	Mon Aug 02 08:18:10 2010 +0200
@@ -28,16 +28,17 @@
     <SqlMethodComment></SqlMethodComment>
     <Sql>
     <![CDATA[
-      SELECT C_Order_ID, o.Name as adorgname, COALESCE(dttrl.Name, dt.Name) as cdoctypename, DocumentNo, bp.Name as cbpartnername, DateOrdered,
+      SELECT ic.C_Order_ID, o.Name as adorgname, COALESCE(dttrl.Name, dt.Name) as cdoctypename, ic.DocumentNo, bp.Name as cbpartnername, ic.DateOrdered,
       amountlines, notinvoicedlines, l.Name as TermName, l.Value as TermValue, pendinglines as pendinglines, '' as amountlinesgross, '' as notinvoicedlinesgross, 
       '' as pendinglinesgross, ic.qtyordered as qtyordered, ic.qtydelivered as qtydelivered
-      FROM C_Invoice_Candidate_v ic, AD_Org o, C_BPartner bp, AD_Ref_List l left join AD_Ref_List_trl ltrl on l.AD_Ref_List_ID=ltrl.AD_Ref_List_ID and ltrl.ad_language=?, 
+      FROM C_Invoice_Candidate_v ic, C_ORDER ord, AD_Org o, C_BPartner bp, AD_Ref_List l left join AD_Ref_List_trl ltrl on l.AD_Ref_List_ID=ltrl.AD_Ref_List_ID and ltrl.ad_language=?, 
       C_DocType dt left join C_DocType_trl dttrl on dt.C_DocType_ID=dttrl.C_DocType_ID AND dttrl.ad_language=?
       WHERE ic.AD_Org_ID=o.AD_Org_ID
       AND ic.C_BPartner_ID=bp.C_BPartner_ID
       AND ic.C_DocType_ID=dt.C_DocType_ID
       AND l.value = ic.term
-      AND ic.term <> 'N'
+      AND ord.C_ORDER_ID=ic.C_ORDER_ID
+      AND ((ic.term = 'D' AND ic.qtydelivered <>0) OR (ic.term = 'I' AND (SELECT SUM(ol.QTYORDERED)-SUM(ol.QTYINVOICED) FROM C_ORDERLINE ol WHERE ol.C_ORDER_ID = ord.C_ORDER_ID) <> 0) OR (ic.term <> 'N' AND (ic.term IN ('O','S') AND (ic.qtyordered = ic.qtydelivered) )) )
       AND AD_Reference_ID='150'
       AND ic.ad_client_id in ('1')
       AND ic.ad_org_id in ('1')
--- a/src/org/openbravo/erpCommon/ad_reports/ReportBudgetExportExcel.java	Thu Jul 29 16:10:28 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportBudgetExportExcel.java	Mon Aug 02 08:18:10 2010 +0200
@@ -53,7 +53,7 @@
 
     vars.removeSessionValue("ReportBudgetGenerateExcel|inpTabId");
 
-    response.setContentType("application/xls");
+    response.setContentType("application/xls; charset=UTF-8");
     PrintWriter out = response.getWriter();
 
     XmlDocument xmlDocument = null;
@@ -71,7 +71,6 @@
 
     xmlDocument.setParameter("directory", "var baseDirectory = \"" + strReplaceWith + "/\";\n");
     xmlDocument.setParameter("language", "defaultLang=\"" + vars.getLanguage() + "\";");
-    xmlDocument.setParameter("theme", vars.getTheme());
 
     xmlDocument.setData("structure1", data);
     out.println(xmlDocument.print());
--- a/src/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcelXLS.html	Thu Jul 29 16:10:28 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcelXLS.html	Mon Aug 02 08:18:10 2010 +0200
@@ -21,7 +21,6 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title>Generate budget excel report</title>
 <link rel="shortcut icon" href="../../../../../web/images/favicon.ico" type="image/x-icon" />
-<link rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Openbravo_ERP_250.css" id="paramCSS" />
       <script language="JavaScript" type="text/javascript" id="paramDirectory">var baseDirectory = "../../../../../web/";</script>
       <script language="JavaScript" type="text/javascript" id="paramLanguage">var defaultLang = "en_US";</script>
 </head>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcelXLS.xml	Thu Jul 29 16:10:28 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcelXLS.xml	Mon Aug 02 08:18:10 2010 +0200
@@ -21,7 +21,6 @@
   <template file="ReportBudgetGenerateExcelXLS.html"/>
 	<PARAMETER id="paramDirectory" name="directory" default=""/>
 	<PARAMETER id="paramLanguage" name="language" default=""/>
-	<PARAMETER id="paramCSS" name="theme" attribute="href" replace="Default"/>
   <structure name="structure1">
     <FIELD id="fieldQty">qty</FIELD>
     <FIELD id="fieldPrice">price</FIELD>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/erpCommon/businessUtility/Organization_data.xsql	Mon Aug 02 08:18:10 2010 +0200
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ *************************************************************************
+ * 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) 2010 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+-->
+
+
+<SqlClass name="OrganizationData" package="org.openbravo.erpCommon.businessUtility" accessModifier="public">
+  <SqlMethod name="select" type="preparedStatement" return="multiple">
+    <SqlMethodComment></SqlMethodComment>
+    <Sql>
+      <![CDATA[
+        SELECT '' AS RESULT
+        FROM AD_ORG
+      ]]>
+    </Sql>
+  </SqlMethod>
+
+  <SqlMethod name="isOrgInTree" type="preparedStatement" return="Boolean" default="false">
+    <SqlMethodComment></SqlMethodComment>
+    <Sql>
+      <![CDATA[
+        select count(*) as result
+        from dual
+        where ad_isorgincluded(?,?,?) <> -1
+           or ad_isorgincluded(?,?,?) <> -1
+      ]]>
+    </Sql>
+    <Parameter name="adOrg1Id"/>
+    <Parameter name="adOrg2Id"/>
+    <Parameter name="adClientId"/>
+    <Parameter name="adOrg2Id"/>
+    <Parameter name="adOrg1Id"/>
+    <Parameter name="adClientId"/>
+  </SqlMethod>
+
+  <SqlMethod name="isParentOrg" type="preparedStatement" return="Boolean" default="false">
+    <SqlMethodComment></SqlMethodComment>
+    <Sql>
+      <![CDATA[
+        select count(*) as result
+        from dual
+        where ad_isorgincluded(?,?,?) <> -1
+      ]]>
+    </Sql>
+    <Parameter name="adOrgId"/>
+    <Parameter name="adParentOrgId"/>
+    <Parameter name="adClientId"/>
+  </SqlMethod>
+
+</SqlClass>
--- a/src/org/openbravo/erpCommon/security/Login_F1.html	Thu Jul 29 16:10:28 2010 +0200
+++ b/src/org/openbravo/erpCommon/security/Login_F1.html	Mon Aug 02 08:18:10 2010 +0200
@@ -111,7 +111,7 @@
       clearForm();
     } catch (e) {}
     setWindowElementFocus('firstElement');
-    if ((!revisionControl('7886')) || (isOpsInstance() != isOpsInstanceCached())) {
+    if ((!revisionControl('7928')) || (isOpsInstance() != isOpsInstanceCached())) {
       alert(cacheMsg);
     }
 
--- a/src/org/openbravo/erpCommon/utility/ToolBar_Button.java	Thu Jul 29 16:10:28 2010 +0200
+++ b/src/org/openbravo/erpCommon/utility/ToolBar_Button.java	Mon Aug 02 08:18:10 2010 +0200
@@ -84,7 +84,12 @@
     toolbar.append("';return true;\" ");
     toolbar
         .append("onMouseOut=\"window.status='';return true;\" onclick=\"this.hideFocus=true\" onblur=\"this.hideFocus=false\" ");
-    toolbar.append("id=\"linkButton").append(name).append("\">");
+    // Needed to build the HTML tag id as refresh has in classic layout
+    if (name.equals("Refresh")) {
+      toolbar.append("id=\"button").append(name).append("\">");
+    } else {
+      toolbar.append("id=\"linkButton").append(name).append("\">");
+    }
     toolbar.append(image);
     toolbar.append("</a>");
     return toolbar.toString();
--- a/src/org/openbravo/erpCommon/utility/ToolBar_Image.java	Thu Jul 29 16:10:28 2010 +0200
+++ b/src/org/openbravo/erpCommon/utility/ToolBar_Image.java	Mon Aug 02 08:18:10 2010 +0200
@@ -48,7 +48,12 @@
     toolbar.append("<img class=\"Main_ToolBar_Button_Icon Main_ToolBar_Button_Icon_").append(
         imageClass).append("\" src=\"").append(base_direction).append("/images/blank.gif\" ");
     toolbar.append("title=\"").append(description);
-    toolbar.append("\" border=\"0\" id=\"button").append(name).append("\"");
+    // Needed to build the HTML tag id as refresh has in classic layout
+    if (name.equals("Refresh")) {
+      toolbar.append("\" border=\"0\" id=\"linkButton").append(name).append("\"");
+    } else {
+      toolbar.append("\" border=\"0\" id=\"button").append(name).append("\"");
+    }
     toolbar.append(">");
     return toolbar.toString();
   }
--- a/src/org/openbravo/erpReports/C_OrderJR.jrxml	Thu Jul 29 16:10:28 2010 +0200
+++ b/src/org/openbravo/erpReports/C_OrderJR.jrxml	Mon Aug 02 08:18:10 2010 +0200
@@ -1,587 +1,585 @@
-<?xml version="1.0" encoding="UTF-8"  ?>
-<!-- Created with iReport - A designer for JasperReports -->
-<!DOCTYPE jasperReport PUBLIC "//JasperReports//DTD Report Design//EN" "http://jasperreports.sourceforge.net/dtds/jasperreport.dtd">
-<jasperReport
-		 name="C_OrderJR"
-		 columnCount="1"
-		 printOrder="Vertical"
-		 orientation="Portrait"
-		 pageWidth="595"
-		 pageHeight="842"
-		 columnWidth="477"
-		 columnSpacing="0"
-		 leftMargin="59"
-		 rightMargin="59"
-		 topMargin="28"
-		 bottomMargin="28"
-		 whenNoDataType="NoPages"
-		 isTitleNewPage="false"
-		 isSummaryNewPage="false">
-	<property name="ireport.scriptlethandling" value="0" />
-	<property name="ireport.encoding" value="UTF-8" />
-	<import value="java.util.*" />
-	<import value="net.sf.jasperreports.engine.*" />
-	<import value="net.sf.jasperreports.engine.data.*" />
-
-	<style 
-		name="default"
-		isDefault="false"
-		vAlign="Middle"
-		fontName="Bitstream Vera Sans"
-		fontSize="10"
-	>
-	</style>
-	<style 
-		name="Report_Title"
-		isDefault="false"
-		fontName="Bitstream Vera Sans"
-		fontSize="18"
-	>
-					<box leftPadding="5"></box>
-	</style>
-	<style 
-		name="Report_Subtitle"
-		isDefault="false"
-		forecolor="#555555"
-		fontName="Bitstream Vera Sans"
-		fontSize="14"
-	>
-					<box leftPadding="5"></box>
-	</style>
-	<style 
-		name="Total_Field"
-		isDefault="false"
-		mode="Opaque"
-		forecolor="#000000"
-		backcolor="#CCCCCC"
-		vAlign="Middle"
-	>
-					<box leftPadding="5"></box>
-	</style>
-	<style 
-		name="Detail_Header"
-		isDefault="false"
-		mode="Opaque"
-		forecolor="#FFFFFF"
-		backcolor="#555555"
-		vAlign="Middle"
-	>
-					<box leftPadding="5">					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
-					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
-</box>
-	</style>
-	<style 
-		name="GroupHeader_DarkGray"
-		isDefault="false"
-		mode="Opaque"
-		forecolor="#FFFFFF"
-		backcolor="#555555"
-		vAlign="Middle"
-		fontName="Bitstream Vera Sans"
-		fontSize="14"
-	>
-					<box leftPadding="5"></box>
-	</style>
-	<style 
-		name="GroupHeader_Gray"
-		isDefault="false"
-		mode="Opaque"
-		backcolor="#999999"
-	>
-	</style>
-	<style 
-		name="Detail_Line"
-		isDefault="false"
-	>
-
-		<conditionalStyle>
-			<conditionExpression><![CDATA[new Boolean($V{REPORT_COUNT}.intValue()%2==1)]]></conditionExpression>
-			<style 
-				name="Detail_Line"
-				isDefault="false"
-				mode="Opaque"
-				backcolor="#CCCCCC"
-			>
-			</style>
-		</conditionalStyle>
-	</style>
-	<style 
-		name="Total_Gray"
-		isDefault="false"
-		mode="Opaque"
-		forecolor="#000000"
-		backcolor="#CCCCCC"
-	>
-	</style>
-
-	<parameter name="ATTACH" isForPrompting="false" class="java.lang.String"/>
-	<parameter name="BASE_WEB" isForPrompting="false" class="java.lang.String"/>
-	<parameter name="BASE_DESIGN" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA["/opt/AppsOpenbravo/src"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="LANGUAGE" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA["en_US"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="USER_CLIENT" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA["('1000000')"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="USER_ORG" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA["('0')"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="REPORT_TITLE" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA["REPORT TITLE"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="REPORT_SUBTITLE" isForPrompting="false" class="java.lang.String"/>
-	<parameter name="SUBREPORT_DIR" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA[$P{BASE_DESIGN} + "/org/openbravo/erpReports"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="DOCUMENT_ID" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA["'1000069'"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="LOCALE" isForPrompting="false" class="java.util.Locale"/>
-	<parameter name="NUMBERFORMAT" isForPrompting="false" class="java.text.DecimalFormat"/>
-	<parameter name="SUBREP_C_OrderLinesJR" isForPrompting="false" class="net.sf.jasperreports.engine.JasperReport"/>
+<?xml version="1.0" encoding="UTF-8"  ?>
+<!-- Created with iReport - A designer for JasperReports -->
+<!DOCTYPE jasperReport PUBLIC "//JasperReports//DTD Report Design//EN" "http://jasperreports.sourceforge.net/dtds/jasperreport.dtd">
+<jasperReport
+		 name="C_OrderJR"
+		 columnCount="1"
+		 printOrder="Vertical"
+		 orientation="Portrait"
+		 pageWidth="595"
+		 pageHeight="842"
+		 columnWidth="483"
+		 columnSpacing="0"
+		 leftMargin="56"
+		 rightMargin="56"
+		 topMargin="56"
+		 bottomMargin="56"
+		 whenNoDataType="NoPages"
+		 isTitleNewPage="false"
+		 isSummaryNewPage="false">
+	<property name="ireport.scriptlethandling" value="0" />
+	<property name="ireport.encoding" value="UTF-8" />
+	<import value="java.util.*" />
+	<import value="net.sf.jasperreports.engine.*" />
+	<import value="net.sf.jasperreports.engine.data.*" />
+
+	<style 
+		name="default"
+		isDefault="false"
+		vAlign="Middle"
+		fontName="Bitstream Vera Sans"
+		fontSize="10"
+	>
+	</style>
+	<style 
+		name="Report_Title"
+		isDefault="false"
+		fontName="Bitstream Vera Sans"
+		fontSize="18"
+	>
+					<box leftPadding="5"></box>
+	</style>
+	<style 
+		name="Group_Data_Label"
+		isDefault="false"
+		fontName="Bitstream Vera Sans"
+		fontSize="11"
+		isBold="true"
+	>
+	</style>
+	<style 
+		name="Report_Subtitle"
+		isDefault="false"
+		forecolor="#555555"
+		fontName="Bitstream Vera Sans"
+		fontSize="14"
+	>
+					<box leftPadding="5"></box>
+	</style>
+	<style 
+		name="Total_Field"
+		isDefault="false"
+		mode="Opaque"
+		forecolor="#000000"
+		backcolor="#CCCCCC"
+		vAlign="Middle"
+	>
+					<box leftPadding="5"></box>
+	</style>
+	<style 
+		name="Detail_Header"
+		isDefault="false"
+		mode="Opaque"
+		forecolor="#FFFFFF"
+		backcolor="#555555"
+		vAlign="Middle"
+	>
+					<box leftPadding="5">					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
+</box>
+	</style>
+	<style 
+		name="GroupHeader_DarkGray"
+		isDefault="false"
+		mode="Opaque"
+		forecolor="#FFFFFF"
+		backcolor="#555555"
+		vAlign="Middle"
+		fontName="Bitstream Vera Sans"
+		fontSize="14"
+	>
+					<box leftPadding="5"></box>
+	</style>
+	<style 
+		name="GroupHeader_Gray"
+		isDefault="false"
+		mode="Opaque"
+		backcolor="#999999"
+	>
+	</style>
+	<style 
+		name="Detail_Line"
+		isDefault="false"
+	>
+
+		<conditionalStyle>
+			<conditionExpression><![CDATA[new Boolean($V{REPORT_COUNT}.intValue()%2==1)]]></conditionExpression>
+			<style 
+				name="Detail_Line"
+				isDefault="false"
+				mode="Opaque"
+				backcolor="#CCCCCC"
+			>
+			</style>
+		</conditionalStyle>
+	</style>
+	<style 
+		name="Total_Gray"
+		isDefault="false"
+		mode="Opaque"
+		forecolor="#000000"
+		backcolor="#CCCCCC"
+	>
+	</style>
+
+	<parameter name="ATTACH" isForPrompting="false" class="java.lang.String"/>
+	<parameter name="BASE_WEB" isForPrompting="false" class="java.lang.String"/>
+	<parameter name="BASE_DESIGN" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA["/opt/AppsOpenbravo/src"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="LANGUAGE" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA["en_US"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="USER_CLIENT" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA["('1000000')"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="USER_ORG" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA["('0')"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="REPORT_TITLE" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA["REPORT TITLE"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="REPORT_SUBTITLE" isForPrompting="false" class="java.lang.String"/>
+	<parameter name="SUBREPORT_DIR" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA[$P{BASE_DESIGN} + "/org/openbravo/erpReports"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="DOCUMENT_ID" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA["'1000069'"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="LOCALE" isForPrompting="false" class="java.util.Locale"/>
+	<parameter name="NUMBERFORMAT" isForPrompting="false" class="java.text.DecimalFormat"/>
+	<parameter name="SUBREP_C_OrderLinesJR" isForPrompting="false" class="net.sf.jasperreports.engine.JasperReport"/>
 	<queryString><![CDATA[SELECT C_ORDER.C_ORDER_ID, C_BPARTNER.NAME, L.ADDRESS1 || 
-        (CASE WHEN (L.POSTAL||L.CITY||R.NAME) IS NOT NULL THEN (CHR(10)||L.POSTAL || (CASE WHEN L.POSTAL IS NOT NULL THEN (' - '||TO_CHAR(L.CITY)) END) || 
-        (CASE WHEN R.NAME IS NOT NULL THEN (' ('||TO_CHAR(R.NAME)|| ')') END)) END) AS ADDRESS1,
-        C_BPARTNER_LOCATION.PHONE,C_BPARTNER_LOCATION.FAX,C_BPARTNER.URL,
-        C_ORDER.DESCRIPTION, C_ORDER.DATEORDERED, C_ORDER.DOCUMENTNO AS ALBARAN, 
-        C_BPARTNER.NAME2 || ' (' || C_BPARTNER.NAME || ')' AS COMPLETE_NAME, AD_CLIENT.DESCRIPTION AS ENTITY, 
-        C_LOCATION_DESCRIPTION(AD_ORGINFO.C_LOCATION_ID) AS LOCATION
-        FROM C_BPARTNER_LOCATION left join C_LOCATION L on C_BPARTNER_LOCATION.C_LOCATION_ID = L.C_LOCATION_ID
-                                 left join  C_REGION R on L.C_REGION_ID = R.C_REGION_ID,
-             AD_USER right join C_ORDER on AD_USER.AD_USER_ID = C_ORDER.AD_USER_ID,
-        C_BPARTNER, AD_ORGINFO, AD_CLIENT
-        WHERE C_ORDER.C_BPARTNER_LOCATION_ID = C_BPARTNER_LOCATION.C_BPARTNER_LOCATION_ID
-        AND C_ORDER.C_BPARTNER_ID = C_BPARTNER.C_BPARTNER_ID 
-        AND C_ORDER.ad_org_id = AD_ORGINFO.ad_org_id
-        AND C_ORDER.AD_CLIENT_ID = AD_CLIENT.AD_CLIENT_ID
-        AND C_ORDER.C_ORDER_ID IN ($P{DOCUMENT_ID})]]></queryString>
-
-	<field name="C_ORDER_ID" class="java.lang.String"/>
-	<field name="NAME" class="java.lang.String"/>
-	<field name="ADDRESS1" class="java.lang.String"/>
-	<field name="PHONE" class="java.lang.String"/>
-	<field name="FAX" class="java.lang.String"/>
-	<field name="URL" class="java.lang.String"/>
-	<field name="DESCRIPTION" class="java.lang.String"/>
-	<field name="DATEORDERED" class="java.util.Date"/>
-	<field name="ALBARAN" class="java.lang.String"/>
-	<field name="COMPLETE_NAME" class="java.lang.String"/>
-	<field name="ENTITY" class="java.lang.String"/>
-	<field name="LOCATION" class="java.lang.String"/>
-
-
-		<group  name="C_ORDER_ID" isStartNewPage="true" isResetPageNumber="true" >
-			<groupExpression><![CDATA[$F{C_ORDER_ID}]]></groupExpression>
-			<groupHeader>
-			<band height="220"  isSplitAllowed="true" >
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+(CASE WHEN (L.POSTAL||L.CITY||R.NAME) IS NOT NULL THEN (CHR(10)||L.POSTAL || (CASE WHEN L.POSTAL IS NOT NULL THEN (' - '||TO_CHAR(L.CITY)) END) || 
+(CASE WHEN R.NAME IS NOT NULL THEN (' ('||TO_CHAR(R.NAME)|| ')') END)) END) AS ADDRESS1,
+C_BPARTNER_LOCATION.PHONE,C_BPARTNER_LOCATION.FAX,C_BPARTNER.URL,
+C_ORDER.DESCRIPTION, C_ORDER.DATEORDERED, C_ORDER.DOCUMENTNO AS ALBARAN, 
+C_BPARTNER.NAME2 || ' (' || C_BPARTNER.NAME || ')' AS COMPLETE_NAME, AD_CLIENT.DESCRIPTION AS ENTITY, 
+C_LOCATION_DESCRIPTION(AD_ORGINFO.C_LOCATION_ID) AS LOCATION,  C_ORDER.ad_org_id AS ORGANIZATIONID, C_ORDER.docstatus AS STATUS,
+(COALESCE(TO_CHAR(AD_USER.NAME) || '\n','') || COALESCE(TO_CHAR(C_BPARTNER.TAXID) || '\n','') || COALESCE(TO_CHAR(ADDRESS1) || '\n','')
+|| COALESCE(TO_CHAR(POSTAL) || '\n','') || COALESCE(TO_CHAR(C_BPARTNER_LOCATION.PHONE) || '\n','') || COALESCE(TO_CHAR(C_BPARTNER_LOCATION.FAX) || '\n','')) AS BP_DATA,
+AD_ORGINFO.TAXID AS ORG_TAXID, SHOWLOGO, SHOWCOMPANYDATA, HEADERMARGIN, AD_ORG.NAME AS ORG_NAME, DELIVERYRULE.NAME AS DELIVERYTERM, PAYMENTTERM.TERM AS PAYMENTTERM
+FROM C_BPARTNER_LOCATION left join C_LOCATION L on C_BPARTNER_LOCATION.C_LOCATION_ID = L.C_LOCATION_ID
+			 left join  C_REGION R on L.C_REGION_ID = R.C_REGION_ID,
+     AD_USER right join C_ORDER on AD_USER.AD_USER_ID = C_ORDER.AD_USER_ID
+                         left join C_POC_DOCTYPE_TEMPLATE ON C_POC_DOCTYPE_TEMPLATE.C_DOCTYPE_ID = C_ORDER.C_DOCTYPE_ID,
+C_BPARTNER, AD_ORGINFO, AD_CLIENT, AD_ORG,
+   (SELECT VALUE, NAME 
+    FROM AD_REF_LIST_V 
+    WHERE AD_REFERENCE_ID = '151' 
+          AND AD_LANGUAGE IN ($P{LANGUAGE})) DELIVERYRULE, 
+   (SELECT C_PAYMENTTERM.C_PAYMENTTERM_ID, COALESCE( C_PAYMENTTERM_TRL.NAME, C_PAYMENTTERM.NAME) AS TERM 
+    FROM C_PAYMENTTERM LEFT JOIN C_PAYMENTTERM_TRL ON C_PAYMENTTERM.C_PAYMENTTERM_ID = C_PAYMENTTERM_TRL.C_PAYMENTTERM_ID 
+          AND C_PAYMENTTERM_TRL.AD_LANGUAGE IN ($P{LANGUAGE})) PAYMENTTERM 
+WHERE C_ORDER.C_BPARTNER_LOCATION_ID = C_BPARTNER_LOCATION.C_BPARTNER_LOCATION_ID
+AND C_ORDER.C_BPARTNER_ID = C_BPARTNER.C_BPARTNER_ID 
+AND AD_ORG.ad_org_id = AD_ORGINFO.ad_org_id
+AND AD_ORG.ad_org_id = (SELECT o.AD_ORG_ID FROM AD_ORG o JOIN AD_OrgType t USING (AD_ORGTYPE_ID)
+WHERE AD_ISORGINCLUDED(C_ORDER.AD_ORG_ID, o.ad_org_id, C_ORDER.ad_client_id)<>-1
+AND (t.IsLegalEntity='Y' OR t.IsAcctLegalEntity='Y'))
+AND C_ORDER.AD_CLIENT_ID = AD_CLIENT.AD_CLIENT_ID
+AND C_ORDER.C_ORDER_ID IN ($P{DOCUMENT_ID})
+AND C_ORDER.DELIVERYRULE = DELIVERYRULE.VALUE  
+AND C_ORDER.C_PAYMENTTERM_ID = PAYMENTTERM.C_PAYMENTTERM_ID]]></queryString>
+
+	<field name="C_ORDER_ID" class="java.lang.String"/>
+	<field name="NAME" class="java.lang.String"/>
+	<field name="ADDRESS1" class="java.lang.String"/>
+	<field name="PHONE" class="java.lang.String"/>
+	<field name="FAX" class="java.lang.String"/>
+	<field name="URL" class="java.lang.String"/>
+	<field name="DESCRIPTION" class="java.lang.String"/>
+	<field name="DATEORDERED" class="java.sql.Timestamp"/>
+	<field name="ALBARAN" class="java.lang.String"/>
+	<field name="COMPLETE_NAME" class="java.lang.String"/>
+	<field name="ENTITY" class="java.lang.String"/>
+	<field name="LOCATION" class="java.lang.String"/>
+	<field name="ORGANIZATIONID" class="java.lang.String"/>
+	<field name="STATUS" class="java.lang.String"/>
+	<field name="BP_DATA" class="java.lang.String"/>
+	<field name="ORG_TAXID" class="java.lang.String"/>
+	<field name="SHOWLOGO" class="java.lang.String"/>
+	<field name="SHOWCOMPANYDATA" class="java.lang.String"/>
+	<field name="HEADERMARGIN" class="java.lang.String"/>
+	<field name="ORG_NAME" class="java.lang.String"/>
+	<field name="DELIVERYTERM" class="java.lang.String"/>
+	<field name="PAYMENTTERM" class="java.lang.String"/>
+
+
+		<group  name="PrintLarge" isReprintHeaderOnEachPage="true" >
+			<groupExpression><![CDATA[]]></groupExpression>
+			<groupHeader>
+			<band height="120"  isSplitAllowed="true" >
+				<printWhenExpression><![CDATA[new Boolean($F{HEADERMARGIN}.equalsIgnoreCase("large"))]]></printWhenExpression>
+			</band>
+			</groupHeader>
+			<groupFooter>
+			<band height="0"  isSplitAllowed="true" >
+			</band>
+			</groupFooter>
+		</group>
+		<group  name="PrintMedium" isReprintHeaderOnEachPage="true" >
+			<groupExpression><![CDATA[]]></groupExpression>
+			<groupHeader>
+			<band height="80"  isSplitAllowed="true" >
+				<printWhenExpression><![CDATA[new Boolean($F{HEADERMARGIN}.equalsIgnoreCase("medium"))]]></printWhenExpression>
+			</band>
+			</groupHeader>
+			<groupFooter>
+			<band height="0"  isSplitAllowed="true" >
+			</band>
+			</groupFooter>
+		</group>
+		<group  name="PrintSmall" isReprintHeaderOnEachPage="true" >
+			<groupExpression><![CDATA[]]></groupExpression>
+			<groupHeader>
+			<band height="50"  isSplitAllowed="true" >
+				<printWhenExpression><![CDATA[new Boolean($F{HEADERMARGIN}.equalsIgnoreCase("small"))]]></printWhenExpression>
+			</band>
+			</groupHeader>
+			<groupFooter>
+			<band height="0"  isSplitAllowed="true" >
+			</band>
+			</groupFooter>
+		</group>
+		<group  name="C_ORDER_ID" isStartNewPage="true" isResetPageNumber="true" >
+			<groupExpression><![CDATA[$F{C_ORDER_ID}]]></groupExpression>
+			<groupHeader>
+			<band height="255"  isSplitAllowed="true" >
+				<staticText>
 					<reportElement
-						x="341"
-						y="49"
-						width="120"
-						height="16"
-						key="textField-5"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement textAlignment="Right">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$F{ENTITY}]]></textFieldExpression>
-				</textField>
-				<staticText>
+						x="0"
+						y="6"
+						width="206"
+						height="37"
+						key="staticText-2"/>
+					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement verticalAlignment="Middle">
+						<font size="26"/>
+					</textElement>
+				<text><![CDATA[SALES ORDER]]></text>
+				</staticText>
+				<staticText>
 					<reportElement
-						x="2"
-						y="39"
-						width="158"
-						height="26"
-						key="staticText-2"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement>
-						<font size="20"/>
-					</textElement>
-				<text><![CDATA[SALES ORDER]]></text>
-				</staticText>
-				<staticText>
+						style="Group_Data_Label"
+						x="0"
+						y="214"
+						width="150"
+						height="18"
+						forecolor="#999999"
+						backcolor="#FFFFFF"
+						key="staticText-6"/>
+					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Left">
+						<font size="11"/>
+					</textElement>
+				<text><![CDATA[Order Number]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
-						x="322"
-						y="129"
-						width="60"
-						height="10"
-						forecolor="#666666"
-						key="staticText-3"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement textAlignment="Right">
-						<font pdfFontName="Helvetica-Bold" size="8" isBold="true"/>
-					</textElement>
-				<text><![CDATA[Phone:]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						x="322"
-						y="139"
-						width="60"
-						height="10"
-						forecolor="#666666"
-						key="staticText-4"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement textAlignment="Right">
-						<font pdfFontName="Helvetica-Bold" size="8" isBold="true"/>
-					</textElement>
-				<text><![CDATA[Fax:]]></text>
-				</staticText>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="383"
-						y="129"
-						width="80"
-						height="10"
-						key="textField-1"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement>
-						<font size="8"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($F{PHONE} == null ? "" : $F{PHONE})]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="383"
-						y="139"
-						width="80"
-						height="10"
-						key="textField-2"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement>
-						<font size="8"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($F{FAX} == null ? "" : $F{FAX})]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="2"
-						y="144"
-						width="121"
-						height="30"
-						key="textField-4"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement textAlignment="Left">
-						<font size="8"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$F{ADDRESS1}]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement
-						x="322"
-						y="149"
-						width="60"
-						height="10"
-						forecolor="#666666"
-						key="staticText-5"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement textAlignment="Right">
-						<font pdfFontName="Helvetica-Bold" size="8" isBold="true"/>
-					</textElement>
-				<text><![CDATA[Internet:]]></text>
-				</staticText>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="383"
-						y="149"
-						width="80"
-						height="10"
-						key="textField-6"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement>
-						<font size="8"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($F{URL} == null ? "" : $F{URL})]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="2"
-						y="124"
-						width="121"
+						x="0"
+						y="234"
+						width="150"
 						height="20"
-						key="textField-7"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement textAlignment="Left">
-						<font size="8"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$F{NAME}]]></textFieldExpression>
-				</textField>
-				<staticText>
+						key="textField-8"/>
+					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement>
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[$F{ALBARAN}]]></textFieldExpression>
+				</textField>
+				<line direction="TopDown">
 					<reportElement
 						x="1"
-						y="183"
-						width="150"
-						height="11"
-						forecolor="#666666"
-						key="staticText-6"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement>
-						<font size="8"/>
-					</textElement>
-				<text><![CDATA[Order Number]]></text>
-				</staticText>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="1"
-						y="196"
-						width="150"
-						height="20"
-						key="textField-8"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement>
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$F{ALBARAN}]]></textFieldExpression>
-				</textField>
-				<line direction="TopDown">
-					<reportElement
-						x="1"
-						y="195"
+						y="233"
 						width="475"
 						height="0"
-						key="line-1"/>
-					<graphicElement stretchType="NoStretch"/>
-				</line>
-				<staticText>
+						key="line-1"/>
+					<graphicElement stretchType="NoStretch"/>
+				</line>
+				<staticText>
 					<reportElement
-						x="391"
-						y="183"
+						style="Group_Data_Label"
+						x="397"
+						y="214"
 						width="80"
-						height="11"
-						forecolor="#666666"
-						key="staticText-8"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement textAlignment="Right">
-						<font size="8"/>
-					</textElement>
-				<text><![CDATA[Date]]></text>
-				</staticText>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+						height="18"
+						forecolor="#999999"
+						backcolor="#FFFFFF"
+						key="staticText-8"/>
+					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Right">
+						<font pdfFontName="Helvetica" size="11" isBold="true"/>
+					</textElement>
+				<text><![CDATA[Date]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
-						x="390"
-						y="196"
+						x="397"
+						y="234"
 						width="80"
 						height="20"
-						key="textField"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement textAlignment="Right">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.util.Date"><![CDATA[$F{DATEORDERED}]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+						key="textField"/>
+					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Right">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.util.Date"><![CDATA[$F{DATEORDERED}]]></textFieldExpression>
+				</textField>
+				<image  scaleImage="RetainShape" vAlign="Top" hAlign="Right" isUsingCache="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
-						x="341"
-						y="65"
-						width="120"
-						height="20"
-						key="textField-12"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement textAlignment="Right">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$F{LOCATION}]]></textFieldExpression>
-				</textField>
-			</band>
-			</groupHeader>
-			<groupFooter>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-			</groupFooter>
-		</group>
-		<background>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</background>
-		<title>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</title>
-		<pageHeader>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</pageHeader>
-		<columnHeader>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</columnHeader>
-		<detail>
-			<band height="45"  isSplitAllowed="true" >
-				<subreport  isUsingCache="false">
+						x="313"
+						y="0"
+						width="170"
+						height="91"
+						key="image-1">
+							<printWhenExpression><![CDATA[new Boolean($F{SHOWLOGO}.equalsIgnoreCase("Y"))]]></printWhenExpression>
+						</reportElement>
+					<box></box>
+					<graphicElement stretchType="NoStretch"/>
+					<imageExpression class="java.lang.String"><![CDATA[$P{BASE_WEB}+"/../utility/ShowImageLogo?logo=yourcompanydoc&orgId=" + $F{ORGANIZATIONID}]]></imageExpression>
+				</image>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						x="121"
+						y="168"
+						width="275"
+						height="55"
+						forecolor="#FF0000"
+						key="textField-16"/>
+					<box></box>
+					<textElement textAlignment="Justified" verticalAlignment="Middle">
+						<font size="36"/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[(($F{STATUS}.compareTo("VO")==0) ? "VOIDED" : " ")]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						x="0"
+						y="93"
+						width="206"
+						height="85"
+						key="textField-17"
+						isPrintWhenDetailOverflows="true"/>
+					<box></box>
+					<textElement verticalAlignment="Top">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[$F{NAME} + "\n" + $F{BP_DATA}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						x="251"
+						y="93"
+						width="232"
+						height="42"
+						key="textField-20"
+						isPrintWhenDetailOverflows="true">
+							<printWhenExpression><![CDATA[new Boolean($F{SHOWCOMPANYDATA}.equalsIgnoreCase("Y"))]]></printWhenExpression>
+						</reportElement>
+					<box></box>
+					<textElement textAlignment="Right">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[($F{LOCATION}==null ? $F{ORG_NAME} + "\n" + $F{ORG_TAXID} + "\n" : $F{ORG_NAME} + "\n" + $F{ORG_TAXID} + "\n" + $F{LOCATION})]]></textFieldExpression>
+				</textField>
+			</band>
+			</groupHeader>
+			<groupFooter>
+			<band height="0"  isSplitAllowed="true" >
+			</band>
+			</groupFooter>
+		</group>
+		<background>
+			<band height="0"  isSplitAllowed="true" >
+			</band>
+		</background>
+		<title>
+			<band height="0"  isSplitAllowed="true" >
+			</band>
+		</title>
+		<pageHeader>
+			<band height="0"  isSplitAllowed="true" >
+			</band>
+		</pageHeader>
+		<columnHeader>
+			<band height="0"  isSplitAllowed="true" >
+			</band>
+		</columnHeader>
+		<detail>
+			<band height="45"  isSplitAllowed="true" >
+				<subreport  isUsingCache="false">
 					<reportElement
 						x="0"
 						y="5"
-						width="470"
+						width="482"
 						height="36"
-						key="subreport-1"/>
-					<subreportParameter  name="C_ORDER_ID">
-						<subreportParameterExpression><![CDATA[$F{C_ORDER_ID}]]></subreportParameterExpression>
-					</subreportParameter>
-					<subreportParameter  name="NUMBERFORMAT">
-						<subreportParameterExpression><![CDATA[$P{NUMBERFORMAT}]]></subreportParameterExpression>
-					</subreportParameter>
-					<subreportParameter  name="LOCALE">
-						<subreportParameterExpression><![CDATA[$P{LOCALE}]]></subreportParameterExpression>
-					</subreportParameter>
-					<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
-					<subreportExpression  class="net.sf.jasperreports.engine.JasperReport"><![CDATA[$P{SUBREP_C_OrderLinesJR}]]></subreportExpression>
-				</subreport>
-			</band>
-		</detail>
-		<columnFooter>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</columnFooter>
-		<pageFooter>
-			<band height="29"  isSplitAllowed="true" >
-				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Report" hyperlinkType="None"  hyperlinkTarget="Self" >
+						key="subreport-1"/>
+					<subreportParameter  name="C_ORDER_ID">
+						<subreportParameterExpression><![CDATA[$F{C_ORDER_ID}]]></subreportParameterExpression>
+					</subreportParameter>
+					<subreportParameter  name="NUMBERFORMAT">
+						<subreportParameterExpression><![CDATA[$P{NUMBERFORMAT}]]></subreportParameterExpression>
+					</subreportParameter>
+					<subreportParameter  name="LOCALE">
+						<subreportParameterExpression><![CDATA[$P{LOCALE}]]></subreportParameterExpression>
+					</subreportParameter>
+					<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
+					<subreportExpression  class="net.sf.jasperreports.engine.JasperReport"><![CDATA[$P{SUBREP_C_OrderLinesJR}]]></subreportExpression>
+				</subreport>
+			</band>
+		</detail>
+		<columnFooter>
+			<band height="0"  isSplitAllowed="true" >
+			</band>
+		</columnFooter>
+		<pageFooter>
+			<band height="90"  isSplitAllowed="true" >
+				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Report" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
-						x="424"
-						y="8"
+						x="439"
+						y="64"
 						width="36"
 						height="19"
 						forecolor="#000000"
 						backcolor="#FFFFFF"
-						key="textField-9"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" lineSpacing="Single">
-						<font fontName="Helvetica" pdfFontName="Helvetica" size="8" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" pdfEncoding ="CP1252" isStrikeThrough="false" />
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA["" + $V{PAGE_NUMBER}]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+						key="textField-9"/>
+					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" lineSpacing="Single">
+						<font fontName="Helvetica" pdfFontName="Helvetica" size="8" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" pdfEncoding ="CP1252" isStrikeThrough="false" />
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA["" + $V{PAGE_NUMBER}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
-						x="325"
-						y="8"
+						x="340"
+						y="64"
 						width="95"
 						height="19"
-						key="textField-10"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font fontName="Helvetica" size="8"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA["Page " + $V{PAGE_NUMBER} + " of "]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="242"
-						y="10"
-						width="59"
-						height="14"
-						key="textField-11"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement textAlignment="Left" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-				<textFieldExpression   class="java.util.Date"><![CDATA[new Date()]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement
-						x="160"
-						y="10"
-						width="78"
-						height="14"
-						key="staticText-9"/>
-					<box rightPadding="4">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-				<text><![CDATA[Generated on]]></text>
-				</staticText>
-				<line direction="TopDown">
+						key="textField-10"/>
+					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font fontName="Helvetica" size="8"/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA["Page " + $V{PAGE_NUMBER} + " of "]]></textFieldExpression>
+				</textField>
+				<line direction="TopDown">
 					<reportElement
 						x="0"
-						y="0"
-						width="475"
+						y="61"
+						width="483"
 						height="0"
-						key="line-2"/>
-					<graphicElement stretchType="NoStretch">
-					<pen lineWidth="0.25" lineStyle="Solid"/>
-</graphicElement>
-				</line>
-			</band>
-		</pageFooter>
-		<summary>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</summary>
-</jasperReport>
+						key="line-2"/>
+					<graphicElement stretchType="NoStretch">
+					<pen lineWidth="0.25" lineStyle="Solid"/>
+</graphicElement>
+				</line>
+				<staticText>
+					<reportElement
+						style="default"
+						x="295"
+						y="11"
+						width="89"
+						height="18"
+						forecolor="#999999"
+						key="staticText-9"/>
+					<box leftPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Left">
+						<font size="8"/>
+					</textElement>
+				<text><![CDATA[Payment Terms]]></text>
+				</staticText>
+				<staticText>
+					<reportElement
+						style="default"
+						x="-3"
+						y="11"
+						width="79"
+						height="18"
+						forecolor="#999999"
+						key="staticText-10"/>
+					<box leftPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement>
+						<font size="8"/>
+					</textElement>
+				<text><![CDATA[Delivery Term]]></text>
+				</staticText>
+				<line direction="TopDown">
+					<reportElement
+						style="default"
+						x="0"
+						y="29"
+						width="483"
+						height="1"
+						key="line-3"/>
+					<graphicElement stretchType="NoStretch"/>
+				</line>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						x="0"
+						y="32"
+						width="79"
+						height="18"
+						key="textField-21"/>
+					<box></box>
+					<textElement>
+						<font size="8"/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[$F{DELIVERYTERM}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						x="298"
+						y="32"
+						width="89"
+						height="18"
+						key="textField-22"/>
+					<box></box>
+					<textElement>
+						<font size="8"/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[$F{PAYMENTTERM}]]></textFieldExpression>
+				</textField>
+			</band>
+		</pageFooter>
+		<summary>
+			<band height="0"  isSplitAllowed="true" >
+			</band>
+		</summary>
+</jasperReport>
--- a/src/org/openbravo/erpReports/C_OrderLinesJR.jrxml	Thu Jul 29 16:10:28 2010 +0200
+++ b/src/org/openbravo/erpReports/C_OrderLinesJR.jrxml	Mon Aug 02 08:18:10 2010 +0200
@@ -6,9 +6,9 @@
 		 columnCount="1"
 		 printOrder="Vertical"
 		 orientation="Portrait"
-		 pageWidth="535"
+		 pageWidth="477"
 		 pageHeight="802"
-		 columnWidth="535"
+		 columnWidth="477"
 		 columnSpacing="0"
 		 leftMargin="0"
 		 rightMargin="0"
@@ -24,6 +24,26 @@
 	<import value="net.sf.jasperreports.engine.data.*" />
 
 	<style 
+		name="default"
+		isDefault="false"
+		vAlign="Middle"
+		fontName="Bitstream Vera Sans"
+		fontSize="8"
+	>
+	</style>
+	<style 
+		name="Detail_Header"
+		isDefault="false"
+		mode="Opaque"
+		forecolor="#FFFFFF"
+		backcolor="#5D5D5D"
+		vAlign="Middle"
+		fontName="Bitstream Vera Sans"
+		fontSize="10"
+		isBold="true"
+	>
+	</style>
+	<style 
 		name="Detail_Line"
 		isDefault="false"
 	>
@@ -34,16 +54,26 @@
 				isDefault="false"
 				mode="Opaque"
 				backcolor="#CCCCCC"
-			/>
+			>
+			</style>
 		</conditionalStyle>
 	</style>
 	<style 
+		name="Total_Gray"
+		isDefault="false"
+		mode="Opaque"
+		forecolor="#000000"
+		backcolor="#CCCCCC"
+	>
+	</style>
+	<style 
 		name="Column_Header"
 		isDefault="false"
 		mode="Opaque"
 		forecolor="#FFFFFF"
 		backcolor="#666666"
-	/>
+	>
+	</style>
 
 	<parameter name="C_ORDER_ID" isForPrompting="true" class="java.lang.String">
 		<defaultValueExpression ><![CDATA["'1000069'"]]></defaultValueExpression>
@@ -51,7 +81,8 @@
 	<parameter name="NUMBERFORMAT" isForPrompting="false" class="java.text.DecimalFormat"/>
 	<parameter name="LOCALE" isForPrompting="false" class="java.util.Locale"/>
 	<queryString><![CDATA[SELECT 1 AS ISBOM, C_ORDERLINE.LINE, COALESCE(M_PRODUCT.NAME, C_ORDERLINE.DESCRIPTION) AS PRODUCT_NAME, C_ORDERLINE.QTYORDERED AS QUANTITY,
-        TO_CHAR(C_UOM.UOMSYMBOL) AS UOM,  C_ORDERLINE.PRICEACTUAL, TO_NUMBER(NULL) AS BASE, C_ORDERLINE.LINENETAMT, TO_NUMBER(NULL) AS TAXLINE,   C_CURRENCY.CURSYMBOL as CURRENCY
+        C_UOM.NAME AS UOM,  C_ORDERLINE.PRICEACTUAL, TO_NUMBER(NULL) AS BASE, C_ORDERLINE.LINENETAMT, TO_NUMBER(NULL) AS TAXLINE,
+        C_CURRENCY.CURSYMBOL as CURRENCY, C_ORDER.docstatus AS STATUS, C_CURRENCY.ISO_CODE as CURRENCY_ISO, M_PRODUCT.VALUE
         FROM C_ORDERLINE left join M_PRODUCT on C_ORDERLINE.M_PRODUCT_ID = M_PRODUCT.M_PRODUCT_ID 
                          left join C_UOM on C_ORDERLINE.C_UOM_ID = C_UOM.C_UOM_ID,
                          C_ORDER, C_CURRENCY 
@@ -60,7 +91,8 @@
               AND C_CURRENCY.C_CURRENCY_ID=C_ORDER.C_CURRENCY_ID
         UNION
         SELECT 2 AS ISBOM, C_ORDERLINE.LINE, M_PRODUCT.NAME AS PRODUCT_NAME, C_ORDERLINE.QTYORDERED*M_PRODUCT_BOM.BOMQTY AS QUANTITY,
-        TO_CHAR(C_UOM.UOMSYMBOL) AS UOM, TO_NUMBER(NULL) AS PRICEACTUAL, TO_NUMBER(NULL) AS BASE, TO_NUMBER(NULL) AS LINENETAMT, TO_NUMBER(NULL) AS TAXLINE, C_CURRENCY.CURSYMBOL as CURRENCY
+        C_UOM.NAME AS UOM, TO_NUMBER(NULL) AS PRICEACTUAL, TO_NUMBER(NULL) AS BASE, TO_NUMBER(NULL) AS LINENETAMT, TO_NUMBER(NULL) AS TAXLINE,
+        C_CURRENCY.ISO_CODE as CURRENCY, C_ORDER.docstatus AS STATUS, C_CURRENCY.ISO_CODE as CURRENCY_ISO, M_PRODUCT.VALUE
         FROM M_PRODUCT_BOM, M_PRODUCT, C_ORDERLINE, C_UOM,  C_ORDER, C_CURRENCY
         WHERE  C_ORDERLINE.M_PRODUCT_ID = M_PRODUCT_BOM.M_PRODUCT_ID
             AND M_PRODUCT_BOM.M_PRODUCTBOM_ID = M_PRODUCT.M_PRODUCT_ID
@@ -69,8 +101,9 @@
             AND C_ORDERLINE.C_ORDER_ID=C_ORDER.C_ORDER_ID
             AND C_CURRENCY.C_CURRENCY_ID=C_ORDER.C_CURRENCY_ID
         UNION
-        SELECT 3 AS ISBOM, TO_NUMBER(null) AS LINE, C_TAX.NAME AS PRODUCT_NAME, TO_NUMBER(NULL) AS QUANTITY, TO_CHAR(NULL) AS UOM, TO_NUMBER(NULL) AS PRICEACTUAL,
-        C_ORDERTAX.TAXBASEAMT AS BASE, C_ORDERTAX.TAXAMT AS LINENETAMT, C_ORDERTAX.LINE AS TAXLINE, C_CURRENCY.CURSYMBOL as CURRENCY
+        SELECT 3 AS ISBOM, TO_NUMBER(null) AS LINE, C_TAX.NAME AS PRODUCT_NAME, TO_NUMBER(NULL) AS QUANTITY, '' AS UOM, TO_NUMBER(NULL) AS PRICEACTUAL,
+        C_ORDERTAX.TAXBASEAMT AS BASE, C_ORDERTAX.TAXAMT AS LINENETAMT, C_ORDERTAX.LINE AS TAXLINE, C_CURRENCY.CURSYMBOL as CURRENCY, C_ORDER.docstatus AS STATUS,
+        C_CURRENCY.ISO_CODE as CURRENCY_ISO, '' AS VALUE
         FROM C_ORDER, C_ORDERTAX, C_TAX, C_CURRENCY
         WHERE C_ORDER.C_ORDER_ID = C_ORDERTAX.C_ORDER_ID
             AND C_TAX.C_TAX_ID = C_ORDERTAX.C_TAX_ID
@@ -79,7 +112,7 @@
             AND C_CURRENCY.C_CURRENCY_ID=C_ORDER.C_CURRENCY_ID
         ORDER BY LINE,ISBOM, TAXLINE]]></queryString>
 
-	<field name="ISBOM" class="java.math.BigDecimal"/>
+	<field name="ISBOM" class="java.lang.Integer"/>
 	<field name="LINE" class="java.math.BigDecimal"/>
 	<field name="PRODUCT_NAME" class="java.lang.String"/>
 	<field name="QUANTITY" class="java.math.BigDecimal"/>
@@ -89,10 +122,220 @@
 	<field name="LINENETAMT" class="java.math.BigDecimal"/>
 	<field name="TAXLINE" class="java.math.BigDecimal"/>
 	<field name="CURRENCY" class="java.lang.String"/>
+	<field name="STATUS" class="java.lang.String"/>
+	<field name="CURRENCY_ISO" class="java.lang.String"/>
+	<field name="VALUE" class="java.lang.String"/>
 
-	<variable name="SUM_LINENETAMT" class="java.math.BigDecimal" resetType="Column" calculation="Sum">
+	<variable name="SUM_LINENETAMT" class="java.math.BigDecimal" resetType="Report" calculation="Sum">
 		<variableExpression><![CDATA[$F{LINENETAMT}]]></variableExpression>
 	</variable>
+
+		<group  name="C_Order_Id" isResetPageNumber="true" >
+			<groupExpression><![CDATA[]]></groupExpression>
+			<groupHeader>
+			<band height="20"  isSplitAllowed="true" >
+				<staticText>
+					<reportElement
+						style="Detail_Header"
+						mode="Opaque"
+						x="235"
+						y="3"
+						width="55"
+						height="17"
+						forecolor="#FFFFFF"
+						backcolor="#666666"
+						key="staticText"/>
+					<box leftPadding="2" rightPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Right" verticalAlignment="Top">
+						<font pdfFontName="Helvetica" size="10" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" isStrikeThrough="false" />
+					</textElement>
+				<text><![CDATA[QUANTITY]]></text>
+				</staticText>
+				<staticText>
+					<reportElement
+						style="Detail_Header"
+						x="200"
+						y="3"
+						width="35"
+						height="17"
+						forecolor="#FFFFFF"
+						key="staticText"/>
+					<box leftPadding="2" rightPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement verticalAlignment="Top">
+						<font size="10" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" isStrikeThrough="false" />
+					</textElement>
+				<text><![CDATA[UOM]]></text>
+				</staticText>
+				<staticText>
+					<reportElement
+						style="Detail_Header"
+						x="65"
+						y="3"
+						width="135"
+						height="17"
+						forecolor="#FFFFFF"
+						key="staticText"/>
+					<box leftPadding="2" rightPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement verticalAlignment="Top">
+						<font size="10" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" isStrikeThrough="false" />
+					</textElement>
+				<text><![CDATA[PRODUCT NAME]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="Detail_Header"
+						x="290"
+						y="3"
+						width="65"
+						height="17"
+						key="textField-3"/>
+					<box></box>
+					<textElement textAlignment="Right" verticalAlignment="Top">
+						<font size="10" isBold="false"/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA["PRICE (" + $F{CURRENCY_ISO} + ")"]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="Detail_Header"
+						x="355"
+						y="3"
+						width="60"
+						height="17"
+						key="textField-4"/>
+					<box></box>
+					<textElement textAlignment="Right" verticalAlignment="Top">
+						<font size="10" isBold="false"/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA["BASE (" + $F{CURRENCY_ISO} + ")"]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="Detail_Header"
+						x="415"
+						y="3"
+						width="60"
+						height="17"
+						key="textField-5"/>
+					<box></box>
+					<textElement textAlignment="Right" verticalAlignment="Top">
+						<font size="10" isBold="false"/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA["NET (" + $F{CURRENCY_ISO} + ")"]]></textFieldExpression>
+				</textField>
+				<line direction="TopDown">
+					<reportElement
+						x="290"
+						y="3"
+						width="0"
+						height="17"
+						forecolor="#FFFFFF"
+						key="line-14"/>
+					<graphicElement stretchType="NoStretch"/>
+				</line>
+				<line direction="TopDown">
+					<reportElement
+						x="0"
+						y="3"
+						width="0"
+						height="17"
+						forecolor="#FFFFFF"
+						key="line-15"/>
+					<graphicElement stretchType="NoStretch"/>
+				</line>
+				<line direction="TopDown">
+					<reportElement
+						x="235"
+						y="3"
+						width="0"
+						height="17"
+						forecolor="#FFFFFF"
+						key="line-16"/>
+					<graphicElement stretchType="NoStretch"/>
+				</line>
+				<line direction="TopDown">
+					<reportElement
+						x="415"
+						y="3"
+						width="0"
+						height="17"
+						forecolor="#FFFFFF"
+						key="line-17"/>
+					<graphicElement stretchType="NoStretch"/>
+				</line>
+				<line direction="TopDown">
+					<reportElement
+						x="355"
+						y="3"
+						width="0"
+						height="17"
+						forecolor="#FFFFFF"
+						key="line-18"/>
+					<graphicElement stretchType="NoStretch"/>
+				</line>
+				<line direction="TopDown">
+					<reportElement
+						x="200"
+						y="3"
+						width="0"
+						height="17"
+						forecolor="#FFFFFF"
+						key="line-19"/>
+					<graphicElement stretchType="NoStretch"/>
+				</line>
+				<line direction="TopDown">
+					<reportElement
+						x="475"
+						y="3"
+						width="0"
+						height="17"
+						forecolor="#FFFFFF"
+						key="line-20"/>
+					<graphicElement stretchType="NoStretch"/>
+				</line>
+				<staticText>
+					<reportElement
+						style="Detail_Header"
+						x="1"
+						y="3"
+						width="65"
+						height="17"
+						key="staticText-1"/>
+					<box></box>
+					<textElement verticalAlignment="Top">
+						<font isBold="false"/>
+					</textElement>
+				<text><![CDATA[REFERENCE]]></text>
+				</staticText>
+				<line direction="TopDown">
+					<reportElement
+						x="65"
+						y="3"
+						width="0"
+						height="17"
+						forecolor="#FFFFFF"
+						key="line-21"/>
+					<graphicElement stretchType="NoStretch"/>
+				</line>
+			</band>
+			</groupHeader>
+			<groupFooter>
+			<band height="0"  isSplitAllowed="true" >
+			</band>
+			</groupFooter>
+		</group>
 		<background>
 			<band height="0"  isSplitAllowed="true" >
 			</band>
@@ -106,99 +349,7 @@
 			</band>
 		</pageHeader>
 		<columnHeader>
-			<band height="20"  isSplitAllowed="true" >
-				<staticText>
-					<reportElement
-						style="Column_Header"
-						mode="Opaque"
-						x="0"
-						y="3"
-						width="50"
-						height="17"
-						forecolor="#FFFFFF"
-						backcolor="#666666"
-						key="staticText"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="2" rightBorder="None" rightBorderColor="#000000" rightPadding="2" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Top">
-						<font size="8" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" isStrikeThrough="false" />
-					</textElement>
-				<text><![CDATA[Quantity]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="Column_Header"
-						x="50"
-						y="3"
-						width="50"
-						height="17"
-						forecolor="#FFFFFF"
-						key="staticText"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="2" rightBorder="None" rightBorderColor="#000000" rightPadding="2" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement verticalAlignment="Top">
-						<font size="8" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" isStrikeThrough="false" />
-					</textElement>
-				<text><![CDATA[Unit]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="Column_Header"
-						x="100"
-						y="3"
-						width="170"
-						height="17"
-						forecolor="#FFFFFF"
-						key="staticText"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="2" rightBorder="None" rightBorderColor="#000000" rightPadding="2" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement verticalAlignment="Top">
-						<font size="8" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" isStrikeThrough="false" />
-					</textElement>
-				<text><![CDATA[Product]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="Column_Header"
-						x="270"
-						y="3"
-						width="60"
-						height="17"
-						forecolor="#FFFFFF"
-						key="staticText"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="2" rightBorder="None" rightBorderColor="#000000" rightPadding="2" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Top">
-						<font size="8" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" isStrikeThrough="false" />
-					</textElement>
-				<text><![CDATA[Price]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="Column_Header"
-						x="330"
-						y="3"
-						width="70"
-						height="17"
-						forecolor="#FFFFFF"
-						key="staticText"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="2" rightBorder="None" rightBorderColor="#000000" rightPadding="2" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Top">
-						<font size="8" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" isStrikeThrough="false" />
-					</textElement>
-				<text><![CDATA[Base]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="Column_Header"
-						x="400"
-						y="3"
-						width="70"
-						height="17"
-						forecolor="#FFFFFF"
-						key="staticText"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="2" rightBorder="None" rightBorderColor="#000000" rightPadding="2" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Top">
-						<font size="8" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" isStrikeThrough="false" />
-					</textElement>
-				<text><![CDATA[Net]]></text>
-				</staticText>
+			<band height="0"  isSplitAllowed="true" >
 			</band>
 		</columnHeader>
 		<detail>
@@ -207,160 +358,226 @@
 						style="Detail_Line"
 						x="0"
 						y="0"
-						width="470"
+						width="475"
 						height="16"
 						key="frame-1"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
+					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
 				</frame>				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
-						x="0"
+						style="default"
+						x="235"
 						y="0"
-						width="50"
+						width="55"
 						height="16"
 						forecolor="#000000"
 						key="textField"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="2" rightBorder="None" rightBorderColor="#000000" rightPadding="2" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<box leftPadding="2" rightPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="8" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" isStrikeThrough="false" />
 					</textElement>
 				<textFieldExpression   class="java.lang.String"><![CDATA[($F{QUANTITY}!=null)?$P{NUMBERFORMAT}.format($F{QUANTITY}):new String(" ")]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
-						x="50"
+						style="default"
+						x="200"
 						y="0"
-						width="50"
+						width="35"
 						height="16"
 						forecolor="#000000"
 						key="textField"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="2" rightBorder="None" rightBorderColor="#000000" rightPadding="2" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement verticalAlignment="Top">
+					<box leftPadding="2" rightPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement verticalAlignment="Middle">
 						<font size="8" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" isStrikeThrough="false" />
 					</textElement>
 				<textFieldExpression   class="java.lang.String"><![CDATA[$F{UOM}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
-						x="100"
+						style="default"
+						x="65"
 						y="0"
-						width="170"
+						width="135"
 						height="16"
 						forecolor="#000000"
 						key="textField"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="2" rightBorder="None" rightBorderColor="#000000" rightPadding="2" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement verticalAlignment="Top">
+					<box leftPadding="2" rightPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement verticalAlignment="Middle">
 						<font size="8" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" isStrikeThrough="false" />
 					</textElement>
 				<textFieldExpression   class="java.lang.String"><![CDATA[$F{PRODUCT_NAME}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
-						x="270"
+						style="default"
+						x="290"
+						y="0"
+						width="65"
+						height="16"
+						forecolor="#000000"
+						key="textField"/>
+					<box leftPadding="2" rightPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="8" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" isStrikeThrough="false" />
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[($F{PRICEACTUAL}!=null)?$P{NUMBERFORMAT}.format($F{PRICEACTUAL}).toString():new String(" ")]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="default"
+						x="355"
 						y="0"
 						width="60"
 						height="16"
 						forecolor="#000000"
 						key="textField"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="2" rightBorder="None" rightBorderColor="#000000" rightPadding="2" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<box leftPadding="2" rightPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="8" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" isStrikeThrough="false" />
 					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($F{PRICEACTUAL}!=null)?$P{NUMBERFORMAT}.format($F{PRICEACTUAL}).toString()+new String(" ") +$F{CURRENCY} :new String(" ")]]></textFieldExpression>
+				<textFieldExpression   class="java.lang.String"><![CDATA[($F{BASE}!=null)?$P{NUMBERFORMAT}.format($F{BASE}).toString() :new String(" ")]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
-						x="330"
+						style="default"
+						x="415"
 						y="0"
-						width="70"
+						width="60"
 						height="16"
 						forecolor="#000000"
 						key="textField"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="2" rightBorder="None" rightBorderColor="#000000" rightPadding="2" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<box leftPadding="2" rightPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="8" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" isStrikeThrough="false" />
 					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($F{BASE}!=null)?$P{NUMBERFORMAT}.format($F{BASE}).toString()+new String(" ") +$F{CURRENCY} :new String(" ")
-]]></textFieldExpression>
+				<textFieldExpression   class="java.lang.String"><![CDATA[($F{LINENETAMT}!=null)?$P{NUMBERFORMAT}.format($F{LINENETAMT}) : new String(" ")]]></textFieldExpression>
 				</textField>
-				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="400"
-						y="0"
-						width="49"
-						height="16"
-						forecolor="#000000"
-						key="textField"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="2" rightBorder="None" rightBorderColor="#000000" rightPadding="2" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Top">
-						<font size="8" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" isStrikeThrough="false" />
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($F{LINENETAMT}!=null)?$P{NUMBERFORMAT}.format($F{LINENETAMT}):new String(" ")]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="454"
-						y="0"
-						width="16"
-						height="16"
-						key="textField"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement>
-						<font size="8"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$F{CURRENCY}]]></textFieldExpression>
-				</textField>
-			</band>
-		</detail>
-		<columnFooter>
-			<band height="18"  isSplitAllowed="true" >
 				<line direction="TopDown">
 					<reportElement
 						x="0"
 						y="0"
-						width="470"
-						height="0"
-						key="line-1"/>
-					<graphicElement stretchType="NoStretch"/>
+						width="0"
+						height="16"
+						key="line-2"
+						stretchType="RelativeToBandHeight"/>
+					<graphicElement stretchType="RelativeToBandHeight"/>
 				</line>
-				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+				<line direction="TopDown">
 					<reportElement
-						x="400"
-						y="1"
-						width="49"
+						x="200"
+						y="0"
+						width="0"
 						height="16"
-						key="textField-1"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="10"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($V{SUM_LINENETAMT}!=null)?$P{NUMBERFORMAT}.format($V{SUM_LINENETAMT}):new String(" ")]]></textFieldExpression>
-				</textField>
-				<staticText>
+						key="line-3"
+						stretchType="RelativeToBandHeight"/>
+					<graphicElement stretchType="RelativeToBandHeight"/>
+				</line>
+				<line direction="TopDown">
 					<reportElement
-						x="330"
-						y="1"
-						width="70"
+						x="235"
+						y="0"
+						width="0"
 						height="16"
-						key="staticText-1"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="2" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<text><![CDATA[Total:]]></text>
-				</staticText>
+						key="line-4"
+						stretchType="RelativeToBandHeight"/>
+					<graphicElement stretchType="RelativeToBandHeight"/>
+				</line>
+				<line direction="TopDown">
+					<reportElement
+						x="290"
+						y="0"
+						width="0"
+						height="16"
+						key="line-5"
+						stretchType="RelativeToBandHeight"/>
+					<graphicElement stretchType="RelativeToBandHeight"/>
+				</line>
+				<line direction="TopDown">
+					<reportElement
+						x="355"
+						y="0"
+						width="0"
+						height="16"
+						key="line-6"
+						stretchType="RelativeToBandHeight"/>
+					<graphicElement stretchType="RelativeToBandHeight"/>
+				</line>
+				<line direction="TopDown">
+					<reportElement
+						x="415"
+						y="0"
+						width="0"
+						height="16"
+						key="line-7"
+						stretchType="RelativeToBandHeight"/>
+					<graphicElement stretchType="RelativeToBandHeight"/>
+				</line>
+				<line direction="TopDown">
+					<reportElement
+						x="475"
+						y="0"
+						width="0"
+						height="16"
+						key="line-8"
+						stretchType="RelativeToBandHeight"/>
+					<graphicElement stretchType="RelativeToBandHeight"/>
+				</line>
 				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
-						x="454"
-						y="2"
-						width="16"
+						style="default"
+						x="1"
+						y="0"
+						width="65"
 						height="16"
-						key="textField-2"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement>
-						<font size="10"/>
+						key="textField-6"/>
+					<box></box>
+					<textElement verticalAlignment="Middle">
+						<font size="8"/>
 					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$F{CURRENCY}]]></textFieldExpression>
+				<textFieldExpression   class="java.lang.String"><![CDATA[$F{VALUE}]]></textFieldExpression>
 				</textField>
+				<line direction="TopDown">
+					<reportElement
+						x="65"
+						y="0"
+						width="0"
+						height="16"
+						key="line-22"
+						stretchType="RelativeToBandHeight"/>
+					<graphicElement stretchType="RelativeToBandHeight"/>
+				</line>
+			</band>
+		</detail>
+		<columnFooter>
+			<band height="0"  isSplitAllowed="true" >
 			</band>
 		</columnFooter>
 		<pageFooter>
@@ -368,7 +585,83 @@
 			</band>
 		</pageFooter>
 		<summary>
-			<band height="0"  isSplitAllowed="true" >
+			<band height="18"  isSplitAllowed="true" >
+				<line direction="TopDown">
+					<reportElement
+						x="0"
+						y="0"
+						width="476"
+						height="0"
+						key="line-1"/>
+					<graphicElement stretchType="NoStretch"/>
+				</line>
+				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="Total_Gray"
+						x="397"
+						y="2"
+						width="78"
+						height="16"
+						key="textField-1"/>
+					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="10"/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[($V{SUM_LINENETAMT}!=null)?$P{NUMBERFORMAT}.format($V{SUM_LINENETAMT}):new String(" ")]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						x="319"
+						y="2"
+						width="78"
+						height="16"
+						key="textField-2"/>
+					<box></box>
+					<textElement textAlignment="Left" verticalAlignment="Middle">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[" TOTAL ("+$F{CURRENCY_ISO}+"): "]]></textFieldExpression>
+				</textField>
+				<line direction="TopDown">
+					<reportElement
+						x="318"
+						y="3"
+						width="0"
+						height="15"
+						key="line-10"/>
+					<graphicElement stretchType="NoStretch"/>
+				</line>
+				<line direction="TopDown">
+					<reportElement
+						x="318"
+						y="17"
+						width="158"
+						height="0"
+						key="line-11"/>
+					<graphicElement stretchType="NoStretch"/>
+				</line>
+				<line direction="TopDown">
+					<reportElement
+						x="318"
+						y="2"
+						width="158"
+						height="0"
+						key="line-12"/>
+					<graphicElement stretchType="NoStretch"/>
+				</line>
+				<line direction="TopDown">
+					<reportElement
+						x="475"
+						y="3"
+						width="0"
+						height="15"
+						key="line-13"/>
+					<graphicElement stretchType="NoStretch"/>
+				</line>
 			</band>
 		</summary>
 </jasperReport>
--- a/src/org/openbravo/erpReports/RptC_Invoice.jrxml	Thu Jul 29 16:10:28 2010 +0200
+++ b/src/org/openbravo/erpReports/RptC_Invoice.jrxml	Mon Aug 02 08:18:10 2010 +0200
@@ -1,897 +1,747 @@
-<?xml version="1.0" encoding="UTF-8"  ?>
-<!-- Created with iReport - A designer for JasperReports -->
-<!DOCTYPE jasperReport PUBLIC "//JasperReports//DTD Report Design//EN" "http://jasperreports.sourceforge.net/dtds/jasperreport.dtd">
-<jasperReport
-		 name="RptC_Invoice"
-		 columnCount="1"
-		 printOrder="Vertical"
-		 orientation="Portrait"
-		 pageWidth="595"
-		 pageHeight="842"
-		 columnWidth="483"
-		 columnSpacing="0"
-		 leftMargin="56"
-		 rightMargin="56"
-		 topMargin="56"
-		 bottomMargin="56"
-		 whenNoDataType="NoPages"
-		 isTitleNewPage="false"
-		 isSummaryNewPage="false">
-	<property name="ireport.scriptlethandling" value="0" />
-	<property name="ireport.encoding" value="UTF-8" />
-	<import value="java.util.*" />
-	<import value="net.sf.jasperreports.engine.*" />
-	<import value="net.sf.jasperreports.engine.data.*" />
-
-	<style 
-		name="default"
-		isDefault="false"
-		vAlign="Middle"
-		fontName="Bitstream Vera Sans"
-		fontSize="8"
-	>
-	</style>
-	<style 
-		name="Report_Title"
-		isDefault="false"
-		fontName="Bitstream Vera Sans"
-		fontSize="18"
-	>
-					<box leftPadding="5"></box>
-	</style>
-	<style 
-		name="Report_Subtitle"
-		isDefault="false"
-		forecolor="#555555"
-		fontName="Bitstream Vera Sans"
-		fontSize="14"
-	>
-					<box leftPadding="5"></box>
-	</style>
-	<style 
-		name="Report_Data_Label"
-		isDefault="false"
-		fontName="Bitstream Vera Sans"
-		fontSize="11"
-		isBold="true"
-	>
-	</style>
-	<style 
-		name="Report_Data_Field"
-		isDefault="false"
-		fontName="Bitstream Vera Sans"
-		fontSize="11"
-		isBold="false"
-	>
-	</style>
-	<style 
-		name="Total_Field"
-		isDefault="false"
-		mode="Opaque"
-		forecolor="#000000"
-		backcolor="#CCCCCC"
-		vAlign="Middle"
-		fontName="Bitstream Vera Sans"
-		fontSize="11"
-		isBold="true"
-	>
-					<box leftPadding="5"></box>
-	</style>
-	<style 
-		name="GroupHeader_DarkGray"
-		isDefault="false"
-		mode="Opaque"
-		forecolor="#FFFFFF"
-		backcolor="#555555"
-		vAlign="Middle"
-		fontName="Bitstream Vera Sans"
-		fontSize="12"
-		isBold="true"
-	>
-					<box leftPadding="5"></box>
-	</style>
-	<style 
-		name="Group_Data_Label"
-		isDefault="false"
-		fontName="Bitstream Vera Sans"
-		fontSize="11"
-		isBold="true"
-	>
-	</style>
-	<style 
-		name="Group_Data_Field"
-		isDefault="false"
-		fontName="Bitstream Vera Sans"
-		fontSize="11"
-	>
-	</style>
-	<style 
-		name="Detail_Header"
-		isDefault="false"
-		mode="Opaque"
-		forecolor="#FFFFFF"
-		backcolor="#5D5D5D"
-		vAlign="Middle"
-		fontName="Bitstream Vera Sans"
-		fontSize="10"
-		isBold="true"
-	>
-					<box leftPadding="5">					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
-					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
-</box>
-	</style>
-	<style 
-		name="Detail_Line"
-		isDefault="false"
-		fontName="Bitstream Vera Sans"
-		fontSize="8"
-	>
-
-		<conditionalStyle>
-			<conditionExpression><![CDATA[new Boolean($V{REPORT_COUNT}.intValue()%2==1)]]></conditionExpression>
-			<style 
-				name="Detail_Line"
-				isDefault="false"
-				mode="Opaque"
-				backcolor="#CCCCCC"
-			>
-			</style>
-		</conditionalStyle>
-	</style>
-	<style 
-		name="Total_Gray"
-		isDefault="false"
-		mode="Opaque"
-		forecolor="#000000"
-		backcolor="#CCCCCC"
-	>
-	</style>
-	<style 
-		name="Detail_Data_Label"
-		isDefault="false"
-		mode="Opaque"
-		backcolor="#CCCCCC"
-		fontName="Bitstream Vera Sans"
-		fontSize="10"
-		isBold="true"
-	>
-	</style>
-	<style 
-		name="Detail_Data_Field"
-		isDefault="false"
-		mode="Opaque"
-		backcolor="#CCCCCC"
-		fontName="Bitstream Vera Sans"
-		fontSize="10"
-	>
-	</style>
-	<style 
-		name="Group_Footer"
-		isDefault="false"
-		fontName="Bitstream Vera Sans"
-		fontSize="11"
-		isBold="true"
-	>
-	</style>
-	<style 
-		name="Report_Footer"
-		isDefault="true"
-		vAlign="Middle"
-		fontName="Bitstream Vera Sans"
-		fontSize="11"
-	>
-	</style>
-
-	<parameter name="DOCUMENT_ID" isForPrompting="true" class="java.lang.String">
-		<defaultValueExpression ><![CDATA["'1000032'"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="DOCUMENT_NAME" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA["'INVOICE'"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="ATTACH" isForPrompting="false" class="java.lang.String"/>
-	<parameter name="BASE_WEB" isForPrompting="false" class="java.lang.String"/>
-	<parameter name="BASE_DESIGN" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA["/home/iperdomo/workspaces/trunk/openbravo/src"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="LANGUAGE" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA["en_US"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="USER_CLIENT" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA["('1000000)"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="USER_ORG" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA["('0')"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="REPORT_TITLE" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA["REPORT TITLE"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="REPORT_SUBTITLE" isForPrompting="false" class="java.lang.String"/>
-	<parameter name="SUBREPORT_DIR" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA[$P{BASE_DESIGN}+"/org/openbravo/erpReports"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="NUMBERFORMAT" isForPrompting="false" class="java.text.DecimalFormat"/>
-	<parameter name="LOCALE" isForPrompting="false" class="java.util.Locale"/>
-	<parameter name="SUBREP_RptC_Invoice_Lines" isForPrompting="false" class="net.sf.jasperreports.engine.JasperReport"/>
-	<parameter name="SUBREP_RptC_Invoice_TaxLines" isForPrompting="false" class="net.sf.jasperreports.engine.JasperReport"/>
+<?xml version="1.0" encoding="UTF-8"  ?>
+<!-- Created with iReport - A designer for JasperReports -->
+<!DOCTYPE jasperReport PUBLIC "//JasperReports//DTD Report Design//EN" "http://jasperreports.sourceforge.net/dtds/jasperreport.dtd">
+<jasperReport
+		 name="RptC_Invoice"
+		 columnCount="1"
+		 printOrder="Vertical"
+		 orientation="Portrait"
+		 pageWidth="595"
+		 pageHeight="842"
+		 columnWidth="483"
+		 columnSpacing="0"
+		 leftMargin="56"
+		 rightMargin="56"
+		 topMargin="56"
+		 bottomMargin="56"
+		 whenNoDataType="NoPages"
+		 isTitleNewPage="false"
+		 isSummaryNewPage="false">
+	<property name="ireport.scriptlethandling" value="0" />
+	<property name="ireport.encoding" value="UTF-8" />
+	<import value="java.util.*" />
+	<import value="net.sf.jasperreports.engine.*" />
+	<import value="net.sf.jasperreports.engine.data.*" />
+
+	<style 
+		name="default"
+		isDefault="false"
+		vAlign="Middle"
+		fontName="Bitstream Vera Sans"
+		fontSize="8"
+	>
+	</style>
+	<style 
+		name="Report_Title"
+		isDefault="false"
+		fontName="Bitstream Vera Sans"
+		fontSize="18"
+	>
+	</style>
+	<style 
+		name="Report_Subtitle"
+		isDefault="false"
+		forecolor="#555555"
+		fontName="Bitstream Vera Sans"
+		fontSize="14"
+	>
+	</style>
+	<style 
+		name="Report_Data_Label"
+		isDefault="false"
+		fontName="Bitstream Vera Sans"
+		fontSize="11"
+		isBold="true"
+	>
+	</style>
+	<style 
+		name="Report_Data_Field"
+		isDefault="false"
+		fontName="Bitstream Vera Sans"
+		fontSize="11"
+		isBold="false"
+	>
+	</style>
+	<style 
+		name="Total_Field"
+		isDefault="false"
+		mode="Opaque"
+		forecolor="#000000"
+		backcolor="#CCCCCC"
+		vAlign="Middle"
+		fontName="Bitstream Vera Sans"
+		fontSize="11"
+		isBold="true"
+	>
+	</style>
+	<style 
+		name="GroupHeader_DarkGray"
+		isDefault="false"
+		mode="Opaque"
+		forecolor="#FFFFFF"
+		backcolor="#555555"
+		vAlign="Middle"
+		fontName="Bitstream Vera Sans"
+		fontSize="12"
+		isBold="true"
+	>
+	</style>
+	<style 
+		name="Group_Data_Label"
+		isDefault="false"
+		fontName="Bitstream Vera Sans"
+		fontSize="11"
+		isBold="true"
+	>
+	</style>
+	<style 
+		name="Group_Data_Field"
+		isDefault="false"
+		fontName="Bitstream Vera Sans"
+		fontSize="11"
+	>
+	</style>
+	<style 
+		name="Detail_Header"
+		isDefault="false"
+		mode="Opaque"
+		forecolor="#FFFFFF"
+		backcolor="#5D5D5D"
+		vAlign="Middle"
+		fontName="Bitstream Vera Sans"
+		fontSize="10"
+		isBold="true"
+	>
+	</style>
+	<style 
+		name="Detail_Line"
+		isDefault="false"
+		fontName="Bitstream Vera Sans"
+		fontSize="8"
+	>
+
+		<conditionalStyle>
+			<conditionExpression><![CDATA[new Boolean($V{REPORT_COUNT}.intValue()%2==1)]]></conditionExpression>
+			<style 
+				name="Detail_Line"
+				isDefault="false"
+				mode="Opaque"
+				backcolor="#CCCCCC"
+			>
+			</style>
+		</conditionalStyle>
+	</style>
+	<style 
+		name="Total_Gray"
+		isDefault="false"
+		mode="Opaque"
+		forecolor="#000000"
+		backcolor="#CCCCCC"
+	>
+	</style>
+	<style 
+		name="Detail_Data_Label"
+		isDefault="false"
+		mode="Opaque"
+		backcolor="#CCCCCC"
+		fontName="Bitstream Vera Sans"
+		fontSize="10"
+		isBold="true"
+	>
+	</style>
+	<style 
+		name="Detail_Data_Field"
+		isDefault="false"
+		mode="Opaque"
+		backcolor="#CCCCCC"
+		fontName="Bitstream Vera Sans"
+		fontSize="10"
+	>
+	</style>
+	<style 
+		name="Group_Footer"
+		isDefault="false"
+		fontName="Bitstream Vera Sans"
+		fontSize="11"
+		isBold="true"
+	>
+	</style>
+	<style 
+		name="Report_Footer"
+		isDefault="true"
+		vAlign="Middle"
+		fontName="Bitstream Vera Sans"
+		fontSize="11"
+	>
+	</style>
+
+	<parameter name="DOCUMENT_ID" isForPrompting="true" class="java.lang.String">
+		<defaultValueExpression ><![CDATA["'1000032'"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="DOCUMENT_NAME" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA["'INVOICE'"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="ATTACH" isForPrompting="false" class="java.lang.String"/>
+	<parameter name="BASE_WEB" isForPrompting="false" class="java.lang.String"/>
+	<parameter name="BASE_DESIGN" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA["/home/openbravo/src/openbravo/erp/devel/bttCourse/pi/src"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="LANGUAGE" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA["en_US"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="USER_CLIENT" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA["('1000000)"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="USER_ORG" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA["('0')"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="REPORT_TITLE" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA["REPORT TITLE"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="REPORT_SUBTITLE" isForPrompting="false" class="java.lang.String"/>
+	<parameter name="SUBREPORT_DIR" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA[$P{BASE_DESIGN}+"/org/openbravo/erpReports/"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="NUMBERFORMAT" isForPrompting="false" class="java.text.DecimalFormat"/>
+	<parameter name="LOCALE" isForPrompting="false" class="java.util.Locale"/>
+	<parameter name="SUBREP_RptC_Invoice_Lines" isForPrompting="false" class="net.sf.jasperreports.engine.JasperReport"/>
+	<parameter name="SUBREP_RptC_Invoice_TaxLines" isForPrompting="false" class="net.sf.jasperreports.engine.JasperReport"/>
 	<queryString><![CDATA[SELECT C_INVOICE.C_INVOICE_ID, C_BPARTNER.NAME, C_BPARTNER.TAXID AS CIF, AD_USER.NAME AS CONTACT_NAME, C_LOCATION.ADDRESS1, 
-       C_LOCATION.POSTAL, C_LOCATION.CITY, C_REGION.NAME AS REGION,C_COUNTRY.NAME AS COUNTRY,C_BPARTNER_LOCATION.PHONE AS PHONE, C_BPARTNER_LOCATION.FAX AS FAX,
-       C_INVOICE.DATEINVOICED, C_INVOICE.DOCUMENTNO, C_BPARTNER.VALUE AS CODE_BPARTNER, 
-       AD_CLIENT.DESCRIPTION AS ENTITY, C_Location_Description(AD_ORGINFO.C_LOCATION_ID) AS LOCATION, C_CURRENCY.ISO_CODE AS CURRENCY_CODE,C_CURRENCY.CURSYMBOL AS SYMBOL,
-       C_PAYMENTTERM.NAME AS PAYTERM
-  FROM C_INVOICE LEFT JOIN C_BPARTNER ON C_INVOICE.C_BPARTNER_ID = C_BPARTNER.C_BPARTNER_ID
-                 LEFT JOIN AD_USER ON C_INVOICE.AD_USER_ID = AD_USER.AD_USER_ID
-                 LEFT JOIN C_BPARTNER_LOCATION ON C_INVOICE.C_BPARTNER_LOCATION_ID = C_BPARTNER_LOCATION.C_BPARTNER_LOCATION_ID
-                 LEFT JOIN C_LOCATION ON C_BPARTNER_LOCATION.C_LOCATION_ID = C_LOCATION.C_LOCATION_ID
-                 LEFT JOIN C_REGION ON C_LOCATION.C_REGION_ID = C_REGION.C_REGION_ID
-                 LEFT JOIN C_COUNTRY ON C_LOCATION.C_COUNTRY_ID=C_COUNTRY.C_COUNTRY_ID
-                 LEFT JOIN C_PAYMENTTERM ON C_INVOICE.C_PAYMENTTERM_ID=C_PAYMENTTERM.C_PAYMENTTERM_ID
-		 LEFT JOIN C_CURRENCY ON C_INVOICE.C_CURRENCY_ID = C_CURRENCY.C_CURRENCY_ID,
-        AD_ORGINFO, AD_CLIENT
-  WHERE C_INVOICE.ad_org_id = AD_ORGINFO.ad_org_id
-    AND C_INVOICE.ad_client_id = AD_CLIENT.ad_client_id
-    AND C_INVOICE.C_INVOICE_ID IN ($P{DOCUMENT_ID})]]></queryString>
-
-	<field name="C_INVOICE_ID" class="java.lang.String"/>
-	<field name="NAME" class="java.lang.String"/>
-	<field name="CIF" class="java.lang.String"/>
-	<field name="CONTACT_NAME" class="java.lang.String"/>
-	<field name="ADDRESS1" class="java.lang.String"/>
-	<field name="POSTAL" class="java.lang.String"/>
-	<field name="CITY" class="java.lang.String"/>
-	<field name="REGION" class="java.lang.String"/>
-	<field name="COUNTRY" class="java.lang.String"/>
-	<field name="PHONE" class="java.lang.String"/>
-	<field name="FAX" class="java.lang.String"/>
-	<field name="DATEINVOICED" class="java.util.Date"/>
-	<field name="DOCUMENTNO" class="java.lang.String"/>
-	<field name="CODE_BPARTNER" class="java.lang.String"/>
-	<field name="ENTITY" class="java.lang.String"/>
-	<field name="LOCATION" class="java.lang.String"/>
-	<field name="CURRENCY_CODE" class="java.lang.String"/>
-	<field name="SYMBOL" class="java.lang.String"/>
-	<field name="PAYTERM" class="java.lang.String"/>
-
-	<variable name="TOTAL_LINENETAMT" class="java.math.BigDecimal" resetType="Group" resetGroup="C_INVOICE_ID" calculation="Nothing">
-	</variable>
-	<variable name="TOTAL_TAXAMT" class="java.math.BigDecimal" resetType="Group" resetGroup="C_INVOICE_ID" calculation="Nothing">
-	</variable>
-
-		<group  name="C_INVOICE_ID" isStartNewPage="true" isResetPageNumber="true" >
-			<groupExpression><![CDATA[$F{C_INVOICE_ID}]]></groupExpression>
-			<groupHeader>
-			<band height="228"  isSplitAllowed="true" >
-				<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+C_LOCATION.POSTAL, C_LOCATION.CITY, C_REGION.NAME AS REGION,C_COUNTRY.NAME AS COUNTRY,C_BPARTNER_LOCATION.PHONE AS PHONE, C_BPARTNER_LOCATION.FAX AS FAX,
+C_INVOICE.DATEINVOICED, C_INVOICE.DOCUMENTNO, C_BPARTNER.VALUE AS CODE_BPARTNER, 
+AD_CLIENT.DESCRIPTION AS ENTITY, C_Location_Description(AD_ORGINFO.C_LOCATION_ID) AS LOCATION, C_CURRENCY.ISO_CODE AS CURRENCY_CODE,C_CURRENCY.CURSYMBOL AS SYMBOL,
+C_PAYMENTTERM.NAME AS PAYTERM, AD_ORGINFO.ad_org_id AS ORGANIZATIONID, C_INVOICE.docstatus AS STATUS, AD_ORG.NAME AS ORG_NAME, AD_ORGINFO.TAXID AS ORG_TAXID,
+C_BPARTNER.TAXID AS BP_TAXID, (COALESCE(TO_CHAR(AD_USER.NAME) || '\n','') || COALESCE(TO_CHAR(C_BPARTNER.TAXID) || '\n','') || COALESCE(TO_CHAR(ADDRESS1) || '\n','')
+|| COALESCE(TO_CHAR(POSTAL) || '\n','') || COALESCE(TO_CHAR(C_BPARTNER_LOCATION.PHONE) || '\n','') || COALESCE(TO_CHAR(C_BPARTNER_LOCATION.FAX) || '\n','')) AS BP_DATA,
+SHOWLOGO, SHOWCOMPANYDATA, HEADERMARGIN
+FROM C_INVOICE LEFT JOIN C_BPARTNER ON C_INVOICE.C_BPARTNER_ID = C_BPARTNER.C_BPARTNER_ID
+	 LEFT JOIN AD_USER ON C_INVOICE.AD_USER_ID = AD_USER.AD_USER_ID
+	 LEFT JOIN C_BPARTNER_LOCATION ON C_INVOICE.C_BPARTNER_LOCATION_ID = C_BPARTNER_LOCATION.C_BPARTNER_LOCATION_ID
+	 LEFT JOIN C_LOCATION ON C_BPARTNER_LOCATION.C_LOCATION_ID = C_LOCATION.C_LOCATION_ID
+	 LEFT JOIN C_REGION ON C_LOCATION.C_REGION_ID = C_REGION.C_REGION_ID
+	 LEFT JOIN C_COUNTRY ON C_LOCATION.C_COUNTRY_ID = C_COUNTRY.C_COUNTRY_ID
+	 LEFT JOIN C_PAYMENTTERM ON C_INVOICE.C_PAYMENTTERM_ID = C_PAYMENTTERM.C_PAYMENTTERM_ID
+	 LEFT JOIN C_CURRENCY ON C_INVOICE.C_CURRENCY_ID = C_CURRENCY.C_CURRENCY_ID
+	 LEFT JOIN C_POC_DOCTYPE_TEMPLATE ON C_POC_DOCTYPE_TEMPLATE.C_DOCTYPE_ID = C_INVOICE.C_DOCTYPE_ID,
+AD_ORGINFO, AD_CLIENT, AD_ORG
+WHERE C_INVOICE.ad_client_id = AD_CLIENT.ad_client_id
+AND C_INVOICE.C_INVOICE_ID IN ($P{DOCUMENT_ID})
+AND AD_ORG.ad_org_id = AD_ORGINFO.ad_org_id
+AND AD_ORG.ad_org_id = (SELECT o.AD_ORG_ID
+                        FROM AD_ORG o JOIN AD_OrgType t USING (AD_ORGTYPE_ID)
+                        WHERE AD_ISORGINCLUDED(C_INVOICE.AD_ORG_ID, o.ad_org_id, C_INVOICE.ad_client_id)<>-1
+                              AND (t.IsLegalEntity='Y' OR t.IsAcctLegalEntity='Y'))]]></queryString>
+
+	<field name="C_INVOICE_ID" class="java.lang.String"/>
+	<field name="NAME" class="java.lang.String"/>
+	<field name="CIF" class="java.lang.String"/>
+	<field name="CONTACT_NAME" class="java.lang.String"/>
+	<field name="ADDRESS1" class="java.lang.String"/>
+	<field name="POSTAL" class="java.lang.String"/>
+	<field name="CITY" class="java.lang.String"/>
+	<field name="REGION" class="java.lang.String"/>
+	<field name="COUNTRY" class="java.lang.String"/>
+	<field name="PHONE" class="java.lang.String"/>
+	<field name="FAX" class="java.lang.String"/>
+	<field name="DATEINVOICED" class="java.util.Date"/>
+	<field name="DOCUMENTNO" class="java.lang.String"/>
+	<field name="CODE_BPARTNER" class="java.lang.String"/>
+	<field name="ENTITY" class="java.lang.String"/>
+	<field name="LOCATION" class="java.lang.String"/>
+	<field name="CURRENCY_CODE" class="java.lang.String"/>
+	<field name="SYMBOL" class="java.lang.String"/>
+	<field name="PAYTERM" class="java.lang.String"/>
+	<field name="ORGANIZATIONID" class="java.lang.String"/>
+	<field name="STATUS" class="java.lang.String"/>
+	<field name="ORG_NAME" class="java.lang.String"/>
+	<field name="ORG_TAXID" class="java.lang.String"/>
+	<field name="BP_TAXID" class="java.lang.String"/>
+	<field name="BP_DATA" class="java.lang.String"/>
+	<field name="SHOWLOGO" class="java.lang.String"/>
+	<field name="SHOWCOMPANYDATA" class="java.lang.String"/>
+	<field name="HEADERMARGIN" class="java.lang.String"/>
+
+	<variable name="TOTAL_LINENETAMT" class="java.math.BigDecimal" resetType="Group" resetGroup="C_INVOICE_ID" calculation="Nothing">
+	</variable>
+	<variable name="TOTAL_TAXAMT" class="java.math.BigDecimal" resetType="Group" resetGroup="C_INVOICE_ID" calculation="Nothing">
+	</variable>
+	<variable name="SHOWLOGO" class="java.lang.String" resetType="Report" calculation="Nothing">
+	</variable>
+	<variable name="SHOWCOMPANYDATA" class="java.lang.String" resetType="Report" calculation="Nothing">
+	</variable>
+
+		<group  name="PrintLarge" isReprintHeaderOnEachPage="true" >
+			<groupExpression><![CDATA[]]></groupExpression>
+			<groupHeader>
+			<band height="120"  isSplitAllowed="true" >
+				<printWhenExpression><![CDATA[new Boolean($F{HEADERMARGIN}.equalsIgnoreCase("large"))]]></printWhenExpression>
+			</band>
+			</groupHeader>
+			<groupFooter>
+			<band height="0"  isSplitAllowed="true" >
+			</band>
+			</groupFooter>
+		</group>
+		<group  name="PrintMedium" isReprintHeaderOnEachPage="true" >
+			<groupExpression><![CDATA[]]></groupExpression>
+			<groupHeader>
+			<band height="80"  isSplitAllowed="true" >
+				<printWhenExpression><![CDATA[new Boolean($F{HEADERMARGIN}.equalsIgnoreCase("medium"))]]></printWhenExpression>
+			</band>
+			</groupHeader>
+			<groupFooter>
+			<band height="0"  isSplitAllowed="true" >
+			</band>
+			</groupFooter>
+		</group>
+		<group  name="PrintSmall" isReprintHeaderOnEachPage="true" >
+			<groupExpression><![CDATA[]]></groupExpression>
+			<groupHeader>
+			<band height="50"  isSplitAllowed="true" >
+				<printWhenExpression><![CDATA[new Boolean($F{HEADERMARGIN}.equalsIgnoreCase("small"))]]></printWhenExpression>
+			</band>
+			</groupHeader>
+			<groupFooter>
+			<band height="0"  isSplitAllowed="true" >
+			</band>
+			</groupFooter>
+		</group>
+		<group  name="C_INVOICE_ID" isStartNewPage="true" isResetPageNumber="true" >
+			<groupExpression><![CDATA[$F{C_INVOICE_ID}]]></groupExpression>
+			<groupHeader>
+			<band height="255"  isSplitAllowed="true" >
+				<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						style="Group_Data_Field"
-						x="1"
-						y="204"
+						x="-3"
+						y="235"
 						width="149"
 						height="18"
-						key="textField"/>
-					<box leftPadding="5" topPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement>
-						<font pdfFontName="Helvetica"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$F{DOCUMENTNO}]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="true" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+						key="textField"/>
+					<box leftPadding="5" topPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Left">
+						<font pdfFontName="Helvetica" size="10"/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[$F{DOCUMENTNO}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						style="default"
-						x="384"
-						y="204"
+						x="387"
+						y="235"
 						width="96"
 						height="18"
-						key="textField"/>
-					<box leftPadding="2" rightPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement textAlignment="Right">
-						<font fontName="Times-Roman"/>
-					</textElement>
-				<textFieldExpression   class="java.util.Date"><![CDATA[$F{DATEINVOICED}]]></textFieldExpression>
-				</textField>
-				<staticText>
+						key="textField"/>
+					<box leftPadding="2" rightPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Right">
+						<font fontName="Times-Roman" size="10"/>
+					</textElement>
+				<textFieldExpression   class="java.util.Date"><![CDATA[$F{DATEINVOICED}]]></textFieldExpression>
+				</textField>
+				<staticText>
 					<reportElement
 						style="Group_Data_Label"
 						mode="Transparent"
-						x="1"
-						y="186"
+						x="-3"
+						y="217"
 						width="149"
 						height="18"
 						forecolor="#999999"
 						backcolor="#FFFFFF"
-						key="element-90"/>
-					<box leftPadding="5" rightPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
-</box>
-					<textElement>
-						<font/>
-					</textElement>
-				<text><![CDATA[Invoice Number]]></text>
-				</staticText>
-				
-				<staticText>
+						key="element-90"/>
+					<box leftPadding="5" rightPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Left">
+						<font pdfFontName="Helvetica"/>
+					</textElement>
+				<text><![CDATA[Invoice Number]]></text>
+				</staticText>
+				<staticText>
 					<reportElement
 						style="Group_Data_Label"
 						mode="Transparent"
-						x="384"
-						y="186"
+						x="387"
+						y="217"
 						width="96"
 						height="18"
 						forecolor="#999999"
 						backcolor="#FFFFFF"
-						key="element-91"/>
-					<box leftPadding="5" rightPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
-</box>
-					<textElement textAlignment="Right">
-						<font pdfFontName="Helvetica-Bold"/>
-					</textElement>
-				<text><![CDATA[Date]]></text>
-				</staticText>
-				<line direction="TopDown">
+						key="element-91"/>
+					<box leftPadding="5" rightPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Right">
+						<font pdfFontName="Helvetica"/>
+					</textElement>
+				<text><![CDATA[Date]]></text>
+				</staticText>
+				<line direction="TopDown">
 					<reportElement
 						style="Detail_Data_Field"
 						x="1"
-						y="203"
+						y="234"
 						width="482"
 						height="0"
-						key="line-35"/>
-					<graphicElement stretchType="NoStretch"/>
-				</line>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+						key="line-35"/>
+					<graphicElement stretchType="NoStretch"/>
+				</line>
+				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
-						x="15"
-						y="94"
-						width="182"
-						height="14"
-						key="textField"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement>
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($F{ADDRESS1}==null?" ":$F{ADDRESS1})]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+						x="0"
+						y="6"
+						width="305"
+						height="37"
+						key="textField"/>
+					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement>
+						<font size="26"/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[$P{DOCUMENT_NAME}.toUpperCase()]]></textFieldExpression>
+				</textField>
+				<image  scaleImage="RetainShape" vAlign="Top" hAlign="Right" isUsingCache="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						style="Report_Footer"
-						x="15"
-						y="61"
-						width="182"
-						height="14"
-						key="textField-2"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement>
-						<font size="10"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA["FAX no.: "+($F{FAX}==null?" ":$F{FAX})]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="332"
+						x="306"
 						y="0"
-						width="142"
-						height="14"
-						key="textField-3"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement textAlignment="Right">
-						<font/>
-					</textElement>
-				
-				<textFieldExpression   class="java.lang.String"><![CDATA[$F{ENTITY}]]></textFieldExpression>
-				</textField>
-				
-				<textField>
-					<reportElement x="15" y="14" width="305" height="37"/>
-					<textElement>
-						<font size="26"/>
-					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[$P{DOCUMENT_NAME}]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+						width="176"
+						height="91"
+						key="image-1">
+							<printWhenExpression><![CDATA[new Boolean($F{SHOWLOGO}.equalsIgnoreCase("Y"))]]></printWhenExpression>
+						</reportElement>
+					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<graphicElement stretchType="NoStretch"/>
+					<imageExpression class="java.net.URL"><![CDATA[new java.net.URL($P{BASE_WEB}+"/../utility/ShowImageLogo?logo=yourcompanydoc&orgId=" + $F{ORGANIZATIONID})]]></imageExpression>
+				</image>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						style="Report_Footer"
-						x="15"
-						y="75"
-						width="182"
-						height="14"
-						key="textField-6"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement>
-						<font size="10"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA["Phone no.: "+($F{PHONE}==null?" ":$F{PHONE})]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="15"
-						y="108"
-						width="182"
-						height="18"
-						key="textField-7"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement>
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($F{POSTAL}==null?" ":$F{POSTAL})+" "+($F{CITY}==null?" ":$F{CITY})+" ("+($F{COUNTRY}==null?" ":$F{COUNTRY})+")"]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="332"
-						y="14"
-						width="142"
-						height="20"
-						key="textField-8"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement textAlignment="Right">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$F{LOCATION}]]></textFieldExpression>
-				</textField>
-			</band>
-			</groupHeader>
-			<groupFooter>
-			<band height="18"  isSplitAllowed="true" >
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+						x="125"
+						y="169"
+						width="275"
+						height="55"
+						forecolor="#FF0000"
+						key="textField-9"
+						positionType="Float"
+						isPrintWhenDetailOverflows="true"/>
+					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font size="36"/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[(($F{STATUS}.compareTo("VO")==0) ? "VOIDED" : " ")]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						style="Report_Footer"
-						x="332"
-						y="-1"
-						width="68"
+						x="0"
+						y="93"
+						width="285"
+						height="85"
+						key="textField-14"
+						isPrintWhenDetailOverflows="true"/>
+					<box></box>
+					<textElement verticalAlignment="Top">
+						<font size="10"/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[$F{NAME} + "\n" + $F{BP_DATA}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="Report_Footer"
+						x="307"
+						y="93"
+						width="176"
+						height="42"
+						key="textField-15"
+						isPrintWhenDetailOverflows="true">
+							<printWhenExpression><![CDATA[new Boolean($F{SHOWCOMPANYDATA}.equalsIgnoreCase("Y"))]]></printWhenExpression>
+						</reportElement>
+					<box></box>
+					<textElement textAlignment="Right">
+						<font size="10"/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[($F{LOCATION}==null ? $F{ORG_NAME} + "\n" + $F{ORG_TAXID} + "\n" : $F{ORG_NAME} + "\n" + $F{ORG_TAXID} + "\n" + $F{LOCATION})]]></textFieldExpression>
+				</textField>
+			</band>
+			</groupHeader>
+			<groupFooter>
+			<band height="72"  isSplitAllowed="true" >
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="Report_Footer"
+						x="316"
+						y="25"
+						width="84"
 						height="17"
-						key="textField-4"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement>
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA["Total ("+$F{SYMBOL}+"): "]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="true" evaluationTime="Group" evaluationGroup="C_INVOICE_ID"  hyperlinkType="None"  hyperlinkTarget="Self" >
+						key="textField-4"/>
+					<box>					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[" TOTAL (" + $F{CURRENCY_CODE}.toString() + "): "]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="true" evaluationTime="Group" evaluationGroup="C_INVOICE_ID"  hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						style="Total_Gray"
 						x="400"
-						y="0"
+						y="25"
 						width="82"
-						height="16"
-						key="textField"/>
-					<box leftPadding="2" rightPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement textAlignment="Right">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($V{TOTAL_LINENETAMT}.add($V{TOTAL_TAXAMT})!=null)?$P{NUMBERFORMAT}.format($V{TOTAL_LINENETAMT}.add($V{TOTAL_TAXAMT})):new String(" ")]]></textFieldExpression>
-				</textField>
-			</band>
-			</groupFooter>
-		</group>
-		<background>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</background>
-		<title>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</title>
-		<pageHeader>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</pageHeader>
-		<columnHeader>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</columnHeader>
-		<detail>
-			<band height="34"  isSplitAllowed="true" >
-				<subreport  isUsingCache="true">
+						height="17"
+						key="textField"/>
+					<box>					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[($V{TOTAL_LINENETAMT}.add($V{TOTAL_TAXAMT})!=null)?$P{NUMBERFORMAT}.format($V{TOTAL_LINENETAMT}.add($V{TOTAL_TAXAMT})):new String(" ")]]></textFieldExpression>
+				</textField>
+				<line direction="TopDown">
+					<reportElement
+						style="Report_Footer"
+						x="316"
+						y="24"
+						width="167"
+						height="0"
+						key="line-39"/>
+					<graphicElement stretchType="NoStretch"/>
+				</line>
+				<line direction="TopDown">
+					<reportElement
+						style="Report_Footer"
+						x="316"
+						y="42"
+						width="167"
+						height="0"
+						key="line-40"/>
+					<graphicElement stretchType="NoStretch"/>
+				</line>
+				<line direction="TopDown">
+					<reportElement
+						style="Report_Footer"
+						x="316"
+						y="24"
+						width="0"
+						height="19"
+						key="line-41"/>
+					<graphicElement stretchType="NoStretch"/>
+				</line>
+				<line direction="TopDown">
+					<reportElement
+						style="Report_Footer"
+						x="482"
+						y="25"
+						width="0"
+						height="18"
+						key="line-42"/>
+					<graphicElement stretchType="NoStretch"/>
+				</line>
+			</band>
+			</groupFooter>
+		</group>
+		<group  name="tax" >
+			<groupExpression><![CDATA[]]></groupExpression>
+			<groupHeader>
+			<band height="0"  isSplitAllowed="true" >
+			</band>
+			</groupHeader>
+			<groupFooter>
+			<band height="16"  isSplitAllowed="false" >
+				<subreport  isUsingCache="true">
 					<reportElement
 						style="Report_Footer"
 						x="0"
 						y="0"
 						width="482"
 						height="16"
-						key="subreport-1"/>
-					<subreportParameter  name="C_INVOICE_ID">
-						<subreportParameterExpression><![CDATA[$F{C_INVOICE_ID}]]></subreportParameterExpression>
-					</subreportParameter>
-					<subreportParameter  name="LOCALE">
-						<subreportParameterExpression><![CDATA[$P{LOCALE}]]></subreportParameterExpression>
-					</subreportParameter>
-					<subreportParameter  name="NUMBERFORMAT">
-						<subreportParameterExpression><![CDATA[$P{NUMBERFORMAT}]]></subreportParameterExpression>
-					</subreportParameter>
-					<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
-					<returnValue subreportVariable="TOTAL_LINENETAMT" toVariable="TOTAL_LINENETAMT"/>
-					<subreportExpression  class="net.sf.jasperreports.engine.JasperReport"><![CDATA[$P{SUBREP_RptC_Invoice_Lines}]]></subreportExpression>
-				</subreport>
-				<subreport  isUsingCache="true">
+						key="subreport-2"
+						positionType="Float"/>
+					<subreportParameter  name="C_INVOICE_ID">
+						<subreportParameterExpression><![CDATA[$F{C_INVOICE_ID}]]></subreportParameterExpression>
+					</subreportParameter>
+					<subreportParameter  name="NUMBERFORMAT">
+						<subreportParameterExpression><![CDATA[$P{NUMBERFORMAT}]]></subreportParameterExpression>
+					</subreportParameter>
+					<subreportParameter  name="LOCALE">
+						<subreportParameterExpression><![CDATA[$P{LOCALE}]]></subreportParameterExpression>
+					</subreportParameter>
+					<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
+					<returnValue subreportVariable="TOTAL_TAXAMT" toVariable="TOTAL_TAXAMT"/>
+					<subreportExpression  class="net.sf.jasperreports.engine.JasperReport"><![CDATA[$P{SUBREP_RptC_Invoice_TaxLines}]]></subreportExpression>
+				</subreport>
+			</band>
+			</groupFooter>
+		</group>
+		<background>
+			<band height="0"  isSplitAllowed="true" >
+			</band>
+		</background>
+		<title>
+			<band height="0"  isSplitAllowed="true" >
+			</band>
+		</title>
+		<pageHeader>
+			<band height="0"  isSplitAllowed="true" >
+			</band>
+		</pageHeader>
+		<columnHeader>
+			<band height="0"  isSplitAllowed="true" >
+			</band>
+		</columnHeader>
+		<detail>
+			<band height="34"  isSplitAllowed="true" >
+				<subreport  isUsingCache="true">
 					<reportElement
 						style="Report_Footer"
 						x="0"
-						y="18"
+						y="0"
 						width="482"
 						height="16"
-						key="subreport-2"
-						positionType="Float"/>
-					<subreportParameter  name="C_INVOICE_ID">
-						<subreportParameterExpression><![CDATA[$F{C_INVOICE_ID}]]></subreportParameterExpression>
-					</subreportParameter>
-					<subreportParameter  name="NUMBERFORMAT">
-						<subreportParameterExpression><![CDATA[$P{NUMBERFORMAT}]]></subreportParameterExpression>
-					</subreportParameter>
-					<subreportParameter  name="LOCALE">
-						<subreportParameterExpression><![CDATA[$P{LOCALE}]]></subreportParameterExpression>
-					</subreportParameter>
-					<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
-					<returnValue subreportVariable="TOTAL_TAXAMT" toVariable="TOTAL_TAXAMT"/>
-					<subreportExpression  class="net.sf.jasperreports.engine.JasperReport"><![CDATA[$P{SUBREP_RptC_Invoice_TaxLines}]]></subreportExpression>
-				</subreport>
-			</band>
-		</detail>
-		<columnFooter>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</columnFooter>
-		<pageFooter>
-			<band height="160"  isSplitAllowed="true" >
-				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+						key="subreport-3"/>
+					<subreportParameter  name="C_INVOICE_ID">
+						<subreportParameterExpression><![CDATA[$F{C_INVOICE_ID}]]></subreportParameterExpression>
+					</subreportParameter>
+					<subreportParameter  name="NUMBERFORMAT">
+						<subreportParameterExpression><![CDATA[$P{NUMBERFORMAT}]]></subreportParameterExpression>
+					</subreportParameter>
+					<subreportParameter  name="LOCALE">
+						<subreportParameterExpression><![CDATA[$P{LOCALE}]]></subreportParameterExpression>
+					</subreportParameter>
+					<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
+					<returnValue subreportVariable="TOTAL_LINENETAMT" toVariable="TOTAL_LINENETAMT"/>
+					<subreportExpression  class="net.sf.jasperreports.engine.JasperReport"><![CDATA[$P{SUBREP_RptC_Invoice_Lines}]]></subreportExpression>
+				</subreport>
+			</band>
+		</detail>
+		<columnFooter>
+			<band height="0"  isSplitAllowed="true" >
+			</band>
+		</columnFooter>
+		<pageFooter>
+			<band height="95"  isSplitAllowed="true" >
+				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						style="default"
 						x="344"
-						y="136"
+						y="70"
 						width="95"
 						height="19"
-						key="textField"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement textAlignment="Right">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA["Page " + $V{PAGE_NUMBER} + " of "]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Report" hyperlinkType="None"  hyperlinkTarget="Self" >
+						key="textField"/>
+					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Right">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA["Page " + $V{PAGE_NUMBER} + " of "]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Report" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						style="default"
 						x="443"
-						y="136"
+						y="70"
 						width="36"
 						height="19"
 						forecolor="#000000"
 						backcolor="#FFFFFF"
-						key="textField"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" lineSpacing="Single">
-						<font pdfFontName="Helvetica" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" pdfEncoding ="CP1252" isStrikeThrough="false" />
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA["" + $V{PAGE_NUMBER}]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+						key="textField"/>
+					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" lineSpacing="Single">
+						<font pdfFontName="Helvetica" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" pdfEncoding ="CP1252" isStrikeThrough="false" />
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA["" + $V{PAGE_NUMBER}]]></textFieldExpression>
+				</textField>
+				<staticText>
 					<reportElement
 						style="default"
-						x="231"
-						y="136"
-						width="69"
-						height="19"
-						key="textField"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement>
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.util.Date"><![CDATA[new Date()]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement
-						style="default"
-						x="150"
-						y="136"
-						width="78"
-						height="19"
-						key="staticText-1"/>
-					<box leftPadding="5" topPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement textAlignment="Right">
-						<font/>
-					</textElement>
-				<text><![CDATA[Generated on]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="default"
-						x="21"
-						y="7"
-						width="79"
-						height="18"
-						forecolor="#999999"
-						key="staticText-7"/>
-					<box leftPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement>
-						<font/>
-					</textElement>
-				<text><![CDATA[Delivery Term]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="default"
-						x="21"
-						y="27"
-						width="79"
-						height="18"
-						forecolor="#000000"
-						key="staticText-8"/>
-					<box leftPadding="2" topPadding="2" bottomPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<text><![CDATA[Immediate]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="default"
-						x="110"
-						y="7"
-						width="106"
-						height="18"
-						forecolor="#999999"
-						key="staticText-9"/>
-					<box leftPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement>
-						<font/>
-					</textElement>
-				<text><![CDATA[Delivery]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="default"
-						x="110"
-						y="27"
-						width="106"
-						height="18"
-						forecolor="#000000"
-						key="staticText-10"
-						stretchType="RelativeToBandHeight"
-						positionType="FixRelativeToBottom"/>
-					<box leftPadding="2" rightPadding="2" topPadding="2" bottomPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<text><![CDATA[from 9:00 to 13:00]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="default"
-						x="224"
-						y="7"
-						width="96"
-						height="18"
-						forecolor="#999999"
-						key="staticText-11"/>
-					<box leftPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement>
-						<font/>
-					</textElement>
-				<text><![CDATA[Delivery Expense]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="default"
-						x="224"
-						y="27"
-						width="96"
-						height="18"
-						forecolor="#000000"
-						key="staticText-12"
-						positionType="FixRelativeToBottom"/>
-					<box leftPadding="2" rightPadding="2" topPadding="2" bottomPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<text><![CDATA[Included]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="default"
-						x="332"
+						x="-1"
 						y="7"
 						width="89"
 						height="18"
 						forecolor="#999999"
-						key="staticText-13"/>
-					<box leftPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement>
-						<font/>
-					</textElement>
-				<text><![CDATA[Payment Terms]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="default"
-						x="1"
-						y="55"
-						width="79"
-						height="18"
-						forecolor="#999999"
-						key="staticText-15"/>
-					<box leftPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement>
-						<font/>
-					</textElement>
-				<text><![CDATA[Notes]]></text>
-				</staticText>
-				<line direction="TopDown">
+						key="staticText-13"/>
+					<box leftPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Left">
+						<font/>
+					</textElement>
+				<text><![CDATA[Payment Terms]]></text>
+				</staticText>
+				<line direction="TopDown">
 					<reportElement
 						style="Report_Footer"
-						x="1"
+						x="0"
 						y="26"
-						width="482"
+						width="483"
 						height="0"
-						key="line-36"/>
-					<graphicElement stretchType="NoStretch"/>
-				</line>
-				<staticText>
+						key="line-36"/>
+					<graphicElement stretchType="NoStretch"/>
+				</line>
+				<line direction="TopDown">
 					<reportElement
-						style="default"
-						x="1"
-						y="76"
-						width="482"
-						height="18"
-						forecolor="#000000"
-						key="staticText-16"
-						positionType="FixRelativeToBottom"/>
-					<box leftPadding="2" rightPadding="2" topPadding="2" bottomPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement>
-						<font/>
-					</textElement>
-				<text><![CDATA[If there is no reply within 48 hours the order will be considered as accepted.]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="default"
-						x="1"
-						y="94"
-						width="482"
-						height="18"
-						forecolor="#000000"
-						key="staticText-17"
-						positionType="FixRelativeToBottom"/>
-					<box leftPadding="2" rightPadding="2" topPadding="2" bottomPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement>
-						<font/>
-					</textElement>
-				<text><![CDATA[Include order No. in shipment and invoice]]></text>
-				</staticText>
-				<line direction="TopDown">
+						x="0"
+						y="70"
+						width="483"
+						height="0"
+						key="line-38"/>
+					<graphicElement stretchType="NoStretch"/>
+				</line>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						x="1"
-						y="74"
-						width="482"
-						height="0"
-						key="line-37"/>
-					<graphicElement stretchType="NoStretch"/>
-				</line>
-				<line direction="TopDown">
-					<reportElement
-						x="0"
-						y="136"
-						width="482"
-						height="0"
-						key="line-38"/>
-					<graphicElement stretchType="NoStretch"/>
-				</line>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="332"
-						y="27"
+						y="25"
 						width="89"
-						height="20"
-						key="textField"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement>
-						<font size="8"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$F{PAYTERM}]]></textFieldExpression>
-				</textField>
-			</band>
-		</pageFooter>
-		<summary>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</summary>
-</jasperReport>
+						height="18"
+						key="textField"/>
+					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement verticalAlignment="Middle">
+						<font size="8"/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[$F{PAYTERM}]]></textFieldExpression>
+				</textField>
+			</band>
+		</pageFooter>
+		<summary>
+			<band height="0"  isSplitAllowed="true" >
+			</band>
+		</summary>
+</jasperReport>
--- a/src/org/openbravo/erpReports/RptC_Invoice_Lines.jrxml	Thu Jul 29 16:10:28 2010 +0200
+++ b/src/org/openbravo/erpReports/RptC_Invoice_Lines.jrxml	Mon Aug 02 08:18:10 2010 +0200
@@ -1,194 +1,187 @@
-<?xml version="1.0" encoding="UTF-8"  ?>
-<!-- Created with iReport - A designer for JasperReports -->
-<!DOCTYPE jasperReport PUBLIC "//JasperReports//DTD Report Design//EN" "http://jasperreports.sourceforge.net/dtds/jasperreport.dtd">
-<jasperReport
-		 name="RptC_Invoice_Lines"
-		 columnCount="1"
-		 printOrder="Vertical"
-		 orientation="Portrait"
-		 pageWidth="482"
-		 pageHeight="842"
-		 columnWidth="482"
-		 columnSpacing="0"
-		 leftMargin="0"
-		 rightMargin="0"
-		 topMargin="0"
-		 bottomMargin="0"
-		 whenNoDataType="NoPages"
-		 isTitleNewPage="false"
-		 isSummaryNewPage="false">
-	<property name="ireport.scriptlethandling" value="0" />
-	<property name="ireport.encoding" value="UTF-8" />
-	<import value="java.util.*" />
-	<import value="net.sf.jasperreports.engine.*" />
-	<import value="net.sf.jasperreports.engine.data.*" />
-
-	<style 
-		name="default"
-		isDefault="false"
-		vAlign="Middle"
-		fontName="Bitstream Vera Sans"
-		fontSize="8"
-	>
-	</style>
-	<style 
-		name="Report_Title"
-		isDefault="false"
-		fontName="Bitstream Vera Sans"
-		fontSize="18"
-	>
-					<box leftPadding="5"></box>
-	</style>
-	<style 
-		name="Report_Subtitle"
-		isDefault="false"
-		forecolor="#555555"
-		fontName="Bitstream Vera Sans"
-		fontSize="14"
-	>
-					<box leftPadding="5"></box>
-	</style>
-	<style 
-		name="Report_Data_Label"
-		isDefault="false"
-		fontName="Bitstream Vera Sans"
-		fontSize="11"
-		isBold="true"
-	>
-	</style>
-	<style 
-		name="Report_Data_Field"
-		isDefault="false"
-		fontName="Bitstream Vera Sans"
-		fontSize="11"
-		isBold="false"
-	>
-	</style>
-	<style 
-		name="Total_Field"
-		isDefault="false"
-		mode="Opaque"
-		forecolor="#000000"
-		backcolor="#CCCCCC"
-		vAlign="Middle"
-		fontName="Bitstream Vera Sans"
-		fontSize="11"
-		isBold="true"
-	>
-					<box leftPadding="5"></box>
-	</style>
-	<style 
-		name="GroupHeader_DarkGray"
-		isDefault="false"
-		mode="Opaque"
-		forecolor="#FFFFFF"
-		backcolor="#555555"
-		vAlign="Middle"
-		fontName="Bitstream Vera Sans"
-		fontSize="12"
-		isBold="true"
-	>
-					<box leftPadding="5"></box>
-	</style>
-	<style 
-		name="Group_Data_Label"
-		isDefault="false"
-		fontName="Bitstream Vera Sans"
-		fontSize="11"
-		isBold="true"
-	>
-	</style>
-	<style 
-		name="Group_Data_Field"
-		isDefault="false"
-		fontName="Bitstream Vera Sans"
-		fontSize="11"
-	>
-	</style>
-	<style 
-		name="Detail_Header"
-		isDefault="false"
-		mode="Opaque"
-		forecolor="#FFFFFF"
-		backcolor="#5D5D5D"
-		vAlign="Middle"
-		fontName="Bitstream Vera Sans"
-		fontSize="10"
-		isBold="true"
-	>
-					<box leftPadding="5">					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
-					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
-</box>
-	</style>
-	<style 
-		name="Detail_Line"
-		isDefault="false"
-		fontName="Bitstream Vera Sans"
-		fontSize="8"
-	>
-
-		<conditionalStyle>
-			<conditionExpression><![CDATA[new Boolean($V{REPORT_COUNT}.intValue()%2==0)]]></conditionExpression>
-			<style 
-				name="Detail_Line"
-				isDefault="false"
-				mode="Opaque"
-				backcolor="#CCCCCC"
-			>
-			</style>
-		</conditionalStyle>
-	</style>
-	<style 
-		name="Total_Gray"
-		isDefault="false"
-		mode="Opaque"
-		forecolor="#000000"
-		backcolor="#CCCCCC"
-	>
-	</style>
-	<style 
-		name="Detail_Data_Label"
-		isDefault="false"
-		mode="Opaque"
-		backcolor="#CCCCCC"
-		fontName="Bitstream Vera Sans"
-		fontSize="10"
-		isBold="true"
-	>
-	</style>
-	<style 
-		name="Detail_Data_Field"
-		isDefault="false"
-		mode="Opaque"
-		backcolor="#CCCCCC"
-		fontName="Bitstream Vera Sans"
-		fontSize="10"
-	>
-	</style>
-	<style 
-		name="Group_Footer"
-		isDefault="false"
-		fontName="Bitstream Vera Sans"
-		fontSize="11"
-		isBold="true"
-	>
-	</style>
-	<style 
-		name="Report_Footer"
-		isDefault="true"
-		vAlign="Middle"
-		fontName="Bitstream Vera Sans"
-		fontSize="11"
-	>
-	</style>
-
-	<parameter name="C_INVOICE_ID" isForPrompting="true" class="java.lang.String"/>
-	<parameter name="NUMBERFORMAT" isForPrompting="false" class="java.text.DecimalFormat"/>
-	<parameter name="LOCALE" isForPrompting="false" class="java.util.Locale"/>
+<?xml version="1.0" encoding="UTF-8"  ?>
+<!-- Created with iReport - A designer for JasperReports -->
+<!DOCTYPE jasperReport PUBLIC "//JasperReports//DTD Report Design//EN" "http://jasperreports.sourceforge.net/dtds/jasperreport.dtd">
+<jasperReport
+		 name="RptC_Invoice_Lines"
+		 columnCount="1"
+		 printOrder="Vertical"
+		 orientation="Portrait"
+		 pageWidth="482"
+		 pageHeight="842"
+		 columnWidth="482"
+		 columnSpacing="0"
+		 leftMargin="0"
+		 rightMargin="0"
+		 topMargin="0"
+		 bottomMargin="0"
+		 whenNoDataType="NoPages"
+		 isTitleNewPage="false"
+		 isSummaryNewPage="false">
+	<property name="ireport.scriptlethandling" value="0" />
+	<property name="ireport.encoding" value="UTF-8" />
+	<import value="java.util.*" />
+	<import value="net.sf.jasperreports.engine.*" />
+	<import value="net.sf.jasperreports.engine.data.*" />
+
+	<style 
+		name="default"
+		isDefault="false"
+		vAlign="Middle"
+		fontName="Bitstream Vera Sans"
+		fontSize="8"
+	>
+	</style>
+	<style 
+		name="Report_Title"
+		isDefault="false"
+		fontName="Bitstream Vera Sans"
+		fontSize="18"
+	>
+	</style>
+	<style 
+		name="Report_Subtitle"
+		isDefault="false"
+		forecolor="#555555"
+		fontName="Bitstream Vera Sans"
+		fontSize="14"
+	>
+	</style>
+	<style 
+		name="Report_Data_Label"
+		isDefault="false"
+		fontName="Bitstream Vera Sans"
+		fontSize="11"
+		isBold="true"
+	>
+	</style>
+	<style 
+		name="Report_Data_Field"
+		isDefault="false"
+		fontName="Bitstream Vera Sans"
+		fontSize="11"
+		isBold="false"
+	>
+	</style>
+	<style 
+		name="Total_Field"
+		isDefault="false"
+		mode="Opaque"
+		forecolor="#000000"
+		backcolor="#CCCCCC"
+		vAlign="Middle"
+		fontName="Bitstream Vera Sans"
+		fontSize="11"
+		isBold="true"
+	>
+	</style>
+	<style 
+		name="GroupHeader_DarkGray"
+		isDefault="false"
+		mode="Opaque"
+		forecolor="#FFFFFF"
+		backcolor="#555555"
+		vAlign="Middle"
+		fontName="Bitstream Vera Sans"
+		fontSize="12"
+		isBold="true"
+	>
+	</style>
+	<style 
+		name="Group_Data_Label"
+		isDefault="false"
+		fontName="Bitstream Vera Sans"
+		fontSize="11"
+		isBold="true"
+	>
+	</style>
+	<style 
+		name="Group_Data_Field"
+		isDefault="false"
+		fontName="Bitstream Vera Sans"
+		fontSize="11"
+	>
+	</style>
+	<style 
+		name="Detail_Header"
+		isDefault="false"
+		mode="Opaque"
+		forecolor="#FFFFFF"
+		backcolor="#5D5D5D"
+		vAlign="Middle"
+		fontName="Bitstream Vera Sans"
+		fontSize="10"
+		isBold="true"
+	>
+	</style>
+	<style 
+		name="Detail_Line"
+		isDefault="false"
+		fontName="Bitstream Vera Sans"
+		fontSize="8"
+	>
+
+		<conditionalStyle>
+			<conditionExpression><![CDATA[new Boolean($V{REPORT_COUNT}.intValue()%2==0)]]></conditionExpression>
+			<style 
+				name="Detail_Line"
+				isDefault="false"
+				mode="Opaque"
+				backcolor="#CCCCCC"
+			>
+			</style>
+		</conditionalStyle>
+	</style>
+	<style 
+		name="Total_Gray"
+		isDefault="false"
+		mode="Opaque"
+		forecolor="#000000"
+		backcolor="#CCCCCC"
+	>
+	</style>
+	<style 
+		name="Detail_Data_Label"
+		isDefault="false"
+		mode="Opaque"
+		backcolor="#CCCCCC"
+		fontName="Bitstream Vera Sans"
+		fontSize="10"
+		isBold="true"
+	>
+	</style>
+	<style 
+		name="Detail_Data_Field"
+		isDefault="false"
+		mode="Opaque"
+		backcolor="#CCCCCC"
+		fontName="Bitstream Vera Sans"
+		fontSize="10"
+	>
+	</style>
+	<style 
+		name="Group_Footer"
+		isDefault="false"
+		fontName="Bitstream Vera Sans"
+		fontSize="11"
+		isBold="true"
+	>
+	</style>
+	<style 
+		name="Report_Footer"
+		isDefault="true"
+		vAlign="Middle"
+		fontName="Bitstream Vera Sans"
+		fontSize="11"
+	>
+	</style>
+
+	<parameter name="C_INVOICE_ID" isForPrompting="true" class="java.lang.String"/>
+	<parameter name="NUMBERFORMAT" isForPrompting="false" class="java.text.DecimalFormat"/>
+	<parameter name="LOCALE" isForPrompting="false" class="java.util.Locale"/>
 	<queryString><![CDATA[SELECT C_INVOICE.C_INVOICE_ID, COALESCE(M_PRODUCT.NAME, C_INVOICELINE.DESCRIPTION) AS NAME_PRODUCT, C_INVOICELINE.QTYINVOICED,
-     C_UOM.NAME AS UOMNAME, C_INVOICELINE.DESCRIPTION, cursymbol as CURRENCY,
+     C_UOM.NAME AS UOMNAME, C_INVOICELINE.DESCRIPTION, C_CURRENCY.ISO_CODE as CURRENCY,
         C_INVOICELINE.LINENETAMT, C_INVOICELINE.PRICEACTUAL,
-        M_INOUT.DOCUMENTNO AS INOUTNO, C_ORDER.DOCUMENTNO AS ORDERNO 
+        M_INOUT.DOCUMENTNO AS INOUTNO, C_ORDER.DOCUMENTNO AS ORDERNO, M_PRODUCT.VALUE AS REFERENCE 
         FROM C_INVOICELINE left join M_PRODUCT on C_INVOICELINE.M_PRODUCT_ID = M_PRODUCT.M_PRODUCT_ID 
                            left join C_UOM on C_INVOICELINE.C_UOM_ID = C_UOM.C_UOM_ID
                            left join M_INOUTLINE on  M_INOUTLINE.M_INOUTLINE_ID = C_INVOICELINE.M_INOUTLINE_ID
@@ -199,398 +192,510 @@
         WHERE C_INVOICELINE.C_INVOICE_ID = C_INVOICE.C_INVOICE_ID
         AND C_INVOICE.C_CURRENCY_ID = C_CURRENCY.C_CURRENCY_ID
         AND C_INVOICE.C_INVOICE_ID = $P{C_INVOICE_ID}
-        ORDER BY C_INVOICELINE.LINE]]></queryString>
-
-	<field name="C_INVOICE_ID" class="java.lang.String"/>
-	<field name="NAME_PRODUCT" class="java.lang.String"/>
-	<field name="QTYINVOICED" class="java.math.BigDecimal"/>
-	<field name="UOMNAME" class="java.lang.String"/>
-	<field name="DESCRIPTION" class="java.lang.String"/>
-	<field name="LINENETAMT" class="java.math.BigDecimal"/>
-	<field name="PRICEACTUAL" class="java.math.BigDecimal"/>
-	<field name="INOUTNO" class="java.lang.String"/>
-	<field name="ORDERNO" class="java.lang.String"/>
-	<field name="CURRENCY" class="java.lang.String"/>
-
-	<variable name="TOTAL_LINENETAMT" class="java.math.BigDecimal" resetType="Group" resetGroup="C_INVOICE_ID" calculation="Sum">
-		<variableExpression><![CDATA[$F{LINENETAMT}]]></variableExpression>
-	</variable>
-
-		<group  name="C_INVOICE_ID" isResetPageNumber="true" >
-			<groupExpression><![CDATA[$F{C_INVOICE_ID}]]></groupExpression>
-			<groupHeader>
-			<band height="16"  isSplitAllowed="true" >
-				<staticText>
+        ORDER BY C_INVOICELINE.LINE]]></queryString>
+
+	<field name="C_INVOICE_ID" class="java.lang.String"/>
+	<field name="NAME_PRODUCT" class="java.lang.String"/>
+	<field name="QTYINVOICED" class="java.math.BigDecimal"/>
+	<field name="UOMNAME" class="java.lang.String"/>
+	<field name="DESCRIPTION" class="java.lang.String"/>
+	<field name="CURRENCY" class="java.lang.String"/>
+	<field name="LINENETAMT" class="java.math.BigDecimal"/>
+	<field name="PRICEACTUAL" class="java.math.BigDecimal"/>
+	<field name="INOUTNO" class="java.lang.String"/>
+	<field name="ORDERNO" class="java.lang.String"/>
+	<field name="REFERENCE" class="java.lang.String"/>
+
+	<variable name="TOTAL_LINENETAMT" class="java.math.BigDecimal" resetType="Group" resetGroup="C_INVOICE_ID" calculation="Sum">
+		<variableExpression><![CDATA[$F{LINENETAMT}]]></variableExpression>
+	</variable>
+
+		<group  name="C_INVOICE_ID" isResetPageNumber="true" >
+			<groupExpression><![CDATA[$F{C_INVOICE_ID}]]></groupExpression>
+			<groupHeader>
+			<band height="16"  isSplitAllowed="true" >
+				<staticText>
 					<reportElement
 						style="Detail_Header"
 						x="0"
 						y="0"
-						width="40"
+						width="72"
 						height="16"
-						key="staticText-1"/>
-					<box leftPadding="5">					<pen lineWidth="0.0"/>
-					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
-</box>
-					<textElement>
-						<font/>
-					</textElement>
-				<text><![CDATA[Reference]]></text>
-				</staticText>
-				<staticText>
+						key="staticText-1"/>
+					<box leftPadding="5">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement>
+						<font isBold="false"/>
+					</textElement>
+				<text><![CDATA[REFERENCE]]></text>
+				</staticText>
+				<staticText>
 					<reportElement
 						style="Detail_Header"
-						x="40"
+						x="72"
 						y="0"
 						width="140"
 						height="16"
-						key="staticText-2"/>
-					<box leftPadding="5">					<pen lineWidth="0.0"/>
-					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
-</box>
-					<textElement>
-						<font/>
-					</textElement>
-				<text><![CDATA[Product Name]]></text>
-				</staticText>
-				<staticText>
+						key="staticText-2"/>
+					<box leftPadding="5">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement>
+						<font isBold="false"/>
+					</textElement>
+				<text><![CDATA[PRODUCT NAME]]></text>
+				</staticText>
+				<staticText>
 					<reportElement
 						style="Detail_Header"
-						x="180"
+						x="212"
 						y="0"
-						width="60"
+						width="50"
 						height="16"
-						key="staticText-3"/>
-					<box leftPadding="5">					<pen lineWidth="0.0"/>
-					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
-</box>
-					<textElement>
-						<font/>
-					</textElement>
-				<text><![CDATA[UOM]]></text>
-				</staticText>
-				<staticText>
+						key="staticText-3"/>
+					<box leftPadding="5">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement>
+						<font isBold="false"/>
+					</textElement>
+				<text><![CDATA[UOM]]></text>
+				</staticText>
+				<staticText>
 					<reportElement
 						style="Detail_Header"
-						x="240"
+						x="262"
 						y="0"
-						width="80"
+						width="58"
 						height="16"
-						key="staticText-4"/>
-					<box leftPadding="5">					<pen lineWidth="0.0"/>
-					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
-</box>
-					<textElement textAlignment="Right">
-						<font pdfFontName="Helvetica-Bold"/>
-					</textElement>
-				<text><![CDATA[Quantity]]></text>
-				</staticText>
-				<staticText>
+						key="staticText-4"/>
+					<box leftPadding="5">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Right">
+						<font pdfFontName="Helvetica" isBold="false"/>
+					</textElement>
+				<text><![CDATA[QUANTITY ]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						style="Detail_Header"
 						x="320"
 						y="0"
 						width="80"
 						height="16"
-						key="staticText-5"/>
-					<box leftPadding="5">					<pen lineWidth="0.0"/>
-					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
-</box>
-					<textElement textAlignment="Right">
-						<font pdfFontName="Helvetica-Bold"/>
-					</textElement>
-				<text><![CDATA[Price]]></text>
-				</staticText>
-				<staticText>
+						key="textField-7"/>
+					<box leftPadding="5">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Right">
+						<font pdfFontName="Helvetica" size="10" isBold="false"/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA["PRICE (" + $F{CURRENCY} + ")"]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						style="Detail_Header"
 						x="400"
 						y="0"
 						width="82"
 						height="16"
-						key="staticText-6"/>
-					<box leftPadding="5">					<pen lineWidth="0.0"/>
-					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
-</box>
-					<textElement textAlignment="Right">
-						<font pdfFontName="Helvetica-Bold"/>
-					</textElement>
-				<text><![CDATA[Total]]></text>
-				</staticText>
-			</band>
-			</groupHeader>
-			<groupFooter>
-			<band height="50"  isSplitAllowed="true" >
-				<line direction="TopDown">
+						key="textField-8"/>
+					<box leftPadding="5">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+</box>
+					<textElement textAlignment="Right">
+						<font pdfFontName="Helvetica" isBold="false"/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA["TOTAL (" + $F{CURRENCY} + ")"]]></textFieldExpression>
+				</textField>
+				<line direction="TopDown">
+					<reportElement
+						style="Report_Footer"
+						x="400"
+						y="0"
+						width="0"
+						height="16"
+						forecolor="#FFFFFF"
+						key="line-9"/>
+					<graphicElement stretchType="NoStretch"/>