Added CDATA to views, functions and triggers.
authorGorka Ion Damián <gorkaion.damian@openbravo.com>
Fri, 14 Dec 2007 16:21:33 +0000
changeset 239 a30acae847e1
parent 238 006d2d0fdea6
child 240 f1b2a873753e
Added CDATA to views, functions and triggers.
database/model/functions/ADD_MONTHS2.xml
database/model/functions/AD_APPLICATION_IMPORT.xml
database/model/functions/AD_COLUMN_FORMAT.xml
database/model/functions/AD_COLUMN_IDENTIFIER.xml
database/model/functions/AD_COLUMN_IDENTIFIER_REF_SQL.xml
database/model/functions/AD_COLUMN_IDENTIFIER_SQL.xml
database/model/functions/AD_COLUMN_IDENTIFIER_STD.xml
database/model/functions/AD_COLUMN_SYNC.xml
database/model/functions/AD_COPY_CLIENT.xml
database/model/functions/AD_DELETE_CLIENT.xml
database/model/functions/AD_DELETE_CLIENT0.xml
database/model/functions/AD_DEPENDENCIES_CREATE.xml
database/model/functions/AD_DEVELOPMENT_MIGRATION.xml
database/model/functions/AD_DISPLAY_LIST.xml
database/model/functions/AD_GET_DOCTYPE.xml
database/model/functions/AD_GET_NEXT_SEQUENCE.xml
database/model/functions/AD_IMPFORMAT_COPY.xml
database/model/functions/AD_ISMEMBERINCLUDED.xml
database/model/functions/AD_ISORGINCLUDED.xml
database/model/functions/AD_LANGUAGE_CREATE.xml
database/model/functions/AD_MAPPING_FORMAT.xml
database/model/functions/AD_MESSAGE_GET.xml
database/model/functions/AD_MESSAGE_GET2.xml
database/model/functions/AD_ORGLIST.xml
database/model/functions/AD_PARENT_MENU_ELEMENT.xml
database/model/functions/AD_PARENT_TREE.xml
database/model/functions/AD_PRINTPAPER_DEFAULT.xml
database/model/functions/AD_SEQUENCE_DOC.xml
database/model/functions/AD_SEQUENCE_DOCTYPE.xml
database/model/functions/AD_SEQUENCE_NEXT.xml
database/model/functions/AD_SEQUENCE_NEXTNO.xml
database/model/functions/AD_SHORTNAME.xml
database/model/functions/AD_SYNCHRONIZE.xml
database/model/functions/AD_TABLE_IMPORT.xml
database/model/functions/AD_TABLE_IMPORT0.xml
database/model/functions/AD_TAB_COPY.xml
database/model/functions/AD_TAB_IMPORT.xml
database/model/functions/AD_TAB_IMPORT0.xml
database/model/functions/AD_TRANSLATE_ID.xml
database/model/functions/AD_UPDATE_ACCESS.xml
database/model/functions/AD_UPDATE_PINSTANCE.xml
database/model/functions/AD_UPDATE_SEQUENCE.xml
database/model/functions/AD_UPDATE_SEQUENCE_GENERATE.xml
database/model/functions/AD_UPDATE_TABLE_IDENTIFIER.xml
database/model/functions/AD_WINDOW_COPY.xml
database/model/functions/AT_TEST_COPY.xml
database/model/functions/AT_TEST_DELETE.xml
database/model/functions/A_AMORTIZATION_PROCESS.xml
database/model/functions/A_ASSET_CREATE.xml
database/model/functions/A_ASSET_GROUP_ACCT_COPY.xml
database/model/functions/A_ASSET_POST.xml
database/model/functions/A_ASSET_POST0.xml
database/model/functions/BOM_PRICELIMIT.xml
database/model/functions/BOM_PRICELIST.xml
database/model/functions/BOM_PRICESTD.xml
database/model/functions/BOM_QTY_AVAILABLE.xml
database/model/functions/BOM_QTY_ONHAND.xml
database/model/functions/BOM_QTY_ORDERED.xml
database/model/functions/BOM_QTY_RESERVED.xml
database/model/functions/CHANGEPROJECTSTATUS.xml
database/model/functions/CHANGEPROJECTSTATUSTOORDER.xml
database/model/functions/CLEVER_TO_NUMBER.xml
database/model/functions/CLOSEPROJECT.xml
database/model/functions/COPY_PRODUCT_TEMPLATE.xml
database/model/functions/COPY_PROJECT_LINES.xml
database/model/functions/C_ACCTSCHEMA_DEFAULT_COPY.xml
database/model/functions/C_BANKSTATEMENT_POST.xml
database/model/functions/C_BASE_CONVERT.xml
database/model/functions/C_BPARTNER_REMITLOCATION.xml
database/model/functions/C_BP_GROUP_ACCT_COPY.xml
database/model/functions/C_BP_SOCREDITUSED_REFRESH.xml
database/model/functions/C_BUDGET_COPY.xml
database/model/functions/C_CASH_POST.xml
database/model/functions/C_COMMISSIONRUN_PROCESS.xml
database/model/functions/C_COMMISSION_COPY.xml
database/model/functions/C_COMMISSION_PROCESS.xml
database/model/functions/C_CONVERTDOCUMENTNO_TO_NUMBER.xml
database/model/functions/C_CREATE_PINVOICE_FROM_OUTS.xml
database/model/functions/C_CURRENCY_CONVERT.xml
database/model/functions/C_CURRENCY_CONVERT0.xml
database/model/functions/C_CURRENCY_RATE.xml
database/model/functions/C_CURRENCY_ROUND.xml
database/model/functions/C_DATEDAYINMONTH.xml
database/model/functions/C_DB_PERCENTAJE_PAID.xml
database/model/functions/C_DEBT_PAYMENT_CHANGE.xml
database/model/functions/C_DEBT_PAYMENT_CREATE.xml
database/model/functions/C_DEBT_PAYMENT_PAID.xml
database/model/functions/C_DEBT_PAYMENT_STATUS.xml
database/model/functions/C_DEBT_PAYMENT_STATUS0.xml
database/model/functions/C_DP_MANAGEMENT_POST.xml
database/model/functions/C_ELEMENTVALUE_COPY.xml
database/model/functions/C_GETBPLOCATIONID.xml
database/model/functions/C_GETTAX.xml
database/model/functions/C_IGNORE_ACCENT.xml
database/model/functions/C_INVOICETODATE.xml
database/model/functions/C_INVOICE_ACCTGEN.xml
database/model/functions/C_INVOICE_CANCEL.xml
database/model/functions/C_INVOICE_CREATE.xml
database/model/functions/C_INVOICE_CREATE0.xml
database/model/functions/C_INVOICE_CREATERECEIPT.xml
database/model/functions/C_INVOICE_DISCOUNT_OLD.xml
database/model/functions/C_INVOICE_PERCENTAJE_PAID.xml
database/model/functions/C_INVOICE_POST.xml
database/model/functions/C_INVOICE_POST0.xml
database/model/functions/C_LOCATION_DESCRIPTION.xml
database/model/functions/C_LOCATION_IDENTIFIER.xml
database/model/functions/C_LOCATION_NAME.xml
database/model/functions/C_ORDER_ACTUALIZE_PRICELIST.xml
database/model/functions/C_ORDER_DRILLDOWN.xml
database/model/functions/C_ORDER_FACT_RESET.xml
database/model/functions/C_ORDER_POST.xml
database/model/functions/C_ORDER_POST1.xml
database/model/functions/C_ORDER_PO_CREATE.xml
database/model/functions/C_ORDER_STATUS.xml
database/model/functions/C_PAYMENTDUEDATE.xml
database/model/functions/C_PAYMENTTERM_DISCOUNT.xml
database/model/functions/C_PAYMENTTERM_DUEDATE.xml
database/model/functions/C_PAYMENTTERM_DUEDAYS.xml
database/model/functions/C_PAYMENTTERM_NOTE.xml
database/model/functions/C_PERIODCONTROL_PROCESS.xml
database/model/functions/C_PERIOD_PROCESS.xml
database/model/functions/C_PROJECT_GENERATE.xml
database/model/functions/C_PROJECT_WON.xml
database/model/functions/C_REMITTANCE_POST.xml
database/model/functions/C_SETTLEMENT_POST.xml
database/model/functions/C_SETTLEMENT_POST0.xml
database/model/functions/C_TRIM.xml
database/model/functions/C_UOM_CONVERT.xml
database/model/functions/C_VALIDCOMBINATION_GET.xml
database/model/functions/C_VALIDCOMBINATION_INSERT.xml
database/model/functions/C_YEARPERIODS.xml
database/model/functions/DATE_NULO.xml
database/model/functions/DBA_AFTERIMPORT.xml
database/model/functions/DBA_CLEANUP.xml
database/model/functions/DBA_COLUMN_DEFAULT.xml
database/model/functions/DBA_COLUMN_SCRIPT.xml
database/model/functions/DBA_CONSTRAINTCMD.xml
database/model/functions/DBA_CONST_SEARCHCOND.xml
database/model/functions/DBA_DISPLAYTYPE.xml
database/model/functions/DBA_FIX_CHANGEINCHARSET.xml
database/model/functions/DBA_RECOMPILE.xml
database/model/functions/DBA_REPLACE_CHANGEDCHARSET.xml
database/model/functions/DBA_USER_CONST_SEARCHCOND.xml
database/model/functions/DBA_VIEW_BODY.xml
database/model/functions/DEBT_PAYMENT_BALANCING_REPLACE.xml
database/model/functions/DIGIT_CONTROL_ACCOUNT.xml
database/model/functions/DIVIDE.xml
database/model/functions/FACT_ACCT_BALANCE_UPDATE.xml
database/model/functions/FACT_ACCT_RESET.xml
database/model/functions/FRIE_NAME.xml
database/model/functions/FRIE_VALUE.xml
database/model/functions/FRIE_VALUE2.xml
database/model/functions/GENERATEPOFROMPROJECT.xml
database/model/functions/GENERATESOFROMPROJECT.xml
database/model/functions/GENERATESOFROMPROJECTORDER.xml
database/model/functions/GENERATESOFROMPROJECTPHASE.xml
database/model/functions/GENERATE_AVERAGE_COSTS.xml
database/model/functions/GENERATE_STANDAR_COSTS.xml
database/model/functions/GETPERIODNAME.xml
database/model/functions/GET_PRICELIST_VERSION.xml
database/model/functions/GET_PRODUCT_COST.xml
database/model/functions/GET_PRODUCT_PRICE.xml
database/model/functions/GET_PRODUCT_PRICE_DATE.xml
database/model/functions/GET_PURCHASE_PRICE.xml
database/model/functions/GL_JOURNALBATCH_POST.xml
database/model/functions/GL_JOURNAL_POST.xml
database/model/functions/GL_JOURNAL_POST0.xml
database/model/functions/GL_PERIOD_OPEN.xml
database/model/functions/IMPORT_PRODUCT.xml
database/model/functions/INSERTAT.xml
database/model/functions/MA_COPY_VERSION.xml
database/model/functions/MA_GLOBALUSE_DISTRIBUTE.xml
database/model/functions/MA_INDIRECT_COST_CALCULATE.xml
database/model/functions/MA_MAINTENANCE_SCHEDULE.xml
database/model/functions/MA_MAINT_ALL.xml
database/model/functions/MA_MEASURE_SHIFT_EXPLODE.xml
database/model/functions/MA_MEASURE_TIME_EXPLODE.xml
database/model/functions/MA_MEASURE_TIME_EXPLODE0.xml
database/model/functions/MA_PC_CASE_CREATE.xml
database/model/functions/MA_PRODUCTIONRUN_STANDARD.xml
database/model/functions/MA_PRODUCTION_COST.xml
database/model/functions/MA_PRODUCTION_COST_GENERATE.xml
database/model/functions/MA_STANDARD_COST.xml
database/model/functions/MA_STANDARD_COST_SEQUENCE.xml
database/model/functions/MA_WORKEFFORT_VALIDATE.xml
database/model/functions/MA_WORKREQUIREMENT_CLOSE.xml
database/model/functions/MA_WORKREQUIREMENT_PROCESS.xml
database/model/functions/MA_WRPHASE_CLOSE.xml
database/model/functions/MRP_CHECK_PLANNINGMETHOD.xml
database/model/functions/MRP_PROCESSPLAN.xml
database/model/functions/MRP_PROCESSPLAN_PLAN.xml
database/model/functions/MRP_PROCESSPLAN_RECALCULATE.xml
database/model/functions/MRP_PROCESSPLAN_RECALCULATE0.xml
database/model/functions/MRP_PRODUCTION_RUN.xml
database/model/functions/MRP_PURCHASEORDER.xml
database/model/functions/MRP_PURCHASEPLAN.xml
database/model/functions/MRP_PURCHASE_RUN.xml
database/model/functions/MRP_REQUISITION.xml
database/model/functions/MRP_RUN_EXPLODE.xml
database/model/functions/MRP_RUN_INITIALIZE.xml
database/model/functions/MRP_RUN_INSERTLINES.xml
database/model/functions/MRP_WORKREQUIREMENT.xml
database/model/functions/M_CHECK_STOCK.xml
database/model/functions/M_DISCOUNTSCHEMA_RESEQ.xml
database/model/functions/M_FREIGHT_CALCULATE.xml
database/model/functions/M_GET_OFFER.xml
database/model/functions/M_GET_OFFERS_APPLIED.xml
database/model/functions/M_GET_OFFERS_NAME.xml
database/model/functions/M_GET_OFFERS_PRICE.xml
database/model/functions/M_GET_OFFERS_STD_PRICE.xml
database/model/functions/M_GET_OFFER_PRICE.xml
database/model/functions/M_GET_OFFER_STD_PRICE.xml
database/model/functions/M_INOUT_CANCEL.xml
database/model/functions/M_INOUT_CREATE.xml
database/model/functions/M_INOUT_CREATE0.xml
database/model/functions/M_INOUT_CREATEINVOICE.xml
database/model/functions/M_INOUT_POST.xml
database/model/functions/M_INOUT_POST0.xml
database/model/functions/M_INOUT_UPDATEQUANTITYES.xml
database/model/functions/M_INTERNAL_CONSUMPTION_POST.xml
database/model/functions/M_INVENTORY_LISTCREATE.xml
database/model/functions/M_INVENTORY_LISTUPDATE.xml
database/model/functions/M_INVENTORY_POST.xml
database/model/functions/M_MOVEMENT_POST.xml
database/model/functions/M_MOVE_LOCATOR.xml
database/model/functions/M_PRICELISTVERSIONGENERATE.xml
database/model/functions/M_PRICELIST_CREATE.xml
database/model/functions/M_PRODUCTION_RUN.xml
database/model/functions/M_PRODUCT_BOM_CHECK.xml
database/model/functions/M_PRODUCT_CATEGORY_ACCT_COPY.xml
database/model/functions/M_PRODUCT_COSTINGUPDATE.xml
database/model/functions/M_PRODUCT_DELETE.xml
database/model/functions/M_RAPPEL_INVOICE_CREATE.xml
database/model/functions/M_UPDATE_INVENTORY.xml
database/model/functions/M_UPDATE_STORAGE_PENDING.xml
database/model/functions/M_WH_ACTIVATE_PERIODS.xml
database/model/functions/M_WH_PERIOD_GENERATE.xml
database/model/functions/NOW.xml
database/model/functions/NUMBER_NULL.xml
database/model/functions/NUMBER_TO_TEXT_ES.xml
database/model/functions/R_REQUEST_DUETYPE.xml
database/model/functions/R_REQUEST_PROCESS.xml
database/model/functions/R_REQUEST_PROCESS0.xml
database/model/functions/R_REQUEST_REOPEN.xml
database/model/functions/SHOW_N_FIRST_CHARS.xml
database/model/functions/S_TIMEEXPENSE_POST.xml
database/model/functions/TEMPLATE.xml
database/model/functions/TRANSLATE_PRODUCT_ID.xml
database/model/functions/TRANSLATE_TAXCATEGORY_ID.xml
database/model/functions/T_INVENTORYVALUE_CREATE.xml
database/model/functions/T_REPLENISH_CREATE.xml
database/model/functions/USER_CONST_SEARCHCOND.xml
database/model/functions/W_REQUEST_BPARTNER.xml
database/model/functions/XX_COLUMN_IDENTIFIER.xml
database/model/triggers/AD_ACCOUNTINGRPT_ELEMENT_TRG.xml
database/model/triggers/AD_ALERTRECIPIENT_TRG.xml
database/model/triggers/AD_ALERTRULE_TRG.xml
database/model/triggers/AD_CALLOUT_TRG.xml
database/model/triggers/AD_CLIENT_TRG.xml
database/model/triggers/AD_COLUMN_TRG.xml
database/model/triggers/AD_DESKTOP_TRG.xml
database/model/triggers/AD_ELEMENT_TRG.xml
database/model/triggers/AD_ELEMENT_TRL_TRG.xml
database/model/triggers/AD_FIELDGROUP_TRG.xml
database/model/triggers/AD_FIELD_TRG.xml
database/model/triggers/AD_FORM_TRG.xml
database/model/triggers/AD_FORM_TRG2.xml
database/model/triggers/AD_MENU_TRG.xml
database/model/triggers/AD_MESSAGE_TRG.xml
database/model/triggers/AD_ORG_TRG.xml
database/model/triggers/AD_PRINTFORMATITEM_BTRG.xml
database/model/triggers/AD_PRINTFORMATITEM_TRG.xml
database/model/triggers/AD_PROCESS_PARA_TRG.xml
database/model/triggers/AD_PROCESS_TRG.xml
database/model/triggers/AD_PROCESS_TRL_TRG.xml
database/model/triggers/AD_REFERENCE_TRG.xml
database/model/triggers/AD_REFERENCE_TRG2.xml
database/model/triggers/AD_REF_LIST_TRG.xml
database/model/triggers/AD_ROLE_ORGACCESS_TRG.xml
database/model/triggers/AD_ROLE_TRG.xml
database/model/triggers/AD_TABLE_TRG.xml
database/model/triggers/AD_TAB_TRG.xml
database/model/triggers/AD_TAB_TRG2.xml
database/model/triggers/AD_TASK_TRG.xml
database/model/triggers/AD_TASK_TRG2.xml
database/model/triggers/AD_TEXTINTERFACES_TRG.xml
database/model/triggers/AD_TREE_TRG.xml
database/model/triggers/AD_WF_NODE_TRG.xml
database/model/triggers/AD_WINDOW_TRG.xml
database/model/triggers/AD_WINDOW_TRG2.xml
database/model/triggers/AD_WINDOW_TRL_TRG.xml
database/model/triggers/AD_WORKBENCH_TRG.xml
database/model/triggers/AD_WORKFLOW_TRG.xml
database/model/triggers/AT_COMMAND_TRG.xml
database/model/triggers/A_AMORTIZATIONLINE_TRG.xml
database/model/triggers/A_AMORTIZATIONLINE_TRG2.xml
database/model/triggers/A_AMORTIZATION_TRG.xml
database/model/triggers/A_ASSET_GROUP_TRG.xml
database/model/triggers/A_ASSET_GROUP_TRG2.xml
database/model/triggers/A_ASSET_TRG.xml
database/model/triggers/A_ASSET_TRG2.xml
database/model/triggers/C_ACCTSCHEMADEL_TRG.xml
database/model/triggers/C_ACCTSCHEMA_ELEMENT_TRG.xml
database/model/triggers/C_ACCTSCHEMA_TRG.xml
database/model/triggers/C_BANKACCOUNT_TRG.xml
database/model/triggers/C_BANKSTATEMENTLINE_TRG.xml
database/model/triggers/C_BANKSTATEMENT_TRG.xml
database/model/triggers/C_BPARTNER_LOCATION_TRG.xml
database/model/triggers/C_BPARTNER_TRG.xml
database/model/triggers/C_BP_GROUP_TRG.xml
database/model/triggers/C_BSTMTLINE_CHK_RESTRICT_TRG.xml
database/model/triggers/C_BSTMT_CHK_RESTRICTIONS_TRG.xml
database/model/triggers/C_CASHBOOK_TRG.xml
database/model/triggers/C_CASHLINE_CHK_RESTRICT_TRG.xml
database/model/triggers/C_CASHLINE_TRG.xml
database/model/triggers/C_CASH_CHK_RESTRICTIONS_TRG.xml
database/model/triggers/C_CASH_TRG.xml
database/model/triggers/C_CHARGE_TRG.xml
database/model/triggers/C_COMMISSIONAMT_TRG.xml
database/model/triggers/C_COMMISSIONDETAIL_TRG.xml
database/model/triggers/C_CONVERSION_RATE_TRG.xml
database/model/triggers/C_CONVERSION_RATE_TRG2.xml
database/model/triggers/C_DEBT_PAYMENT_BAL_TRG.xml
database/model/triggers/C_DEBT_PAYMENT_TRG.xml
database/model/triggers/C_DOCTYPE_COPY_TRG.xml
database/model/triggers/C_DOCTYPE_TRG.xml
database/model/triggers/C_DPMLINE_CHK_RESTRICTIONS_TRG.xml
database/model/triggers/C_DP_MANAGEMENTLINE_TRG.xml
database/model/triggers/C_DP_MANAGEMENT_CHK_RESTR_TRG.xml
database/model/triggers/C_DUNNINGLEVEL_TRG.xml
database/model/triggers/C_ELEMENTVALUE_TRG.xml
database/model/triggers/C_EXTERNALPOS_TRG.xml
database/model/triggers/C_GREETING_TRG.xml
database/model/triggers/C_INVLINE_CHK_RESTRICTIONS_TRG.xml
database/model/triggers/C_INVOICEDISCOUNT_TRG.xml
database/model/triggers/C_INVOICELINE_TRG.xml
database/model/triggers/C_INVOICELINE_TRG2.xml
database/model/triggers/C_INVOICETAX_TRG.xml
database/model/triggers/C_INVOICE_TRG.xml
database/model/triggers/C_INVOICE_TRG2.xml
database/model/triggers/C_INVTAX_CHK_RESTRICTIONS_TRG.xml
database/model/triggers/C_ORDERLINE2_TRG.xml
database/model/triggers/C_ORDERLINE_TRG.xml
database/model/triggers/C_ORDERLINE_TRG2.xml
database/model/triggers/C_ORDERTAX_TRG.xml
database/model/triggers/C_ORDER_CHK_RESTRINCTIONS_TRG.xml
database/model/triggers/C_ORDER_TRG.xml
database/model/triggers/C_ORDER_TRG2.xml
database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml
database/model/triggers/C_PAYMENTTERM_TRG.xml
database/model/triggers/C_PERIOD_TRG.xml
database/model/triggers/C_PERIOD_TRG2.xml
database/model/triggers/C_PROJECTLINE_TRG.xml
database/model/triggers/C_PROJECTLINE_TRG2.xml
database/model/triggers/C_PROJECTPROPOSALTASK_TRG.xml
database/model/triggers/C_PROJECT_TRG.xml
database/model/triggers/C_PROJECT_TRG2.xml
database/model/triggers/C_PROJECT_TRG3.xml
database/model/triggers/C_REMITTANCELINE_TRG.xml
database/model/triggers/C_REMITTANCE_TRG.xml
database/model/triggers/C_REVENUERECOGNITION_PLAN_TRG.xml
database/model/triggers/C_SALESREGION_TRG.xml
database/model/triggers/C_SETTLEMENT_TRG.xml
database/model/triggers/C_TAXCATEGORY_TRG.xml
database/model/triggers/C_TAX_REPORT_TRG.xml
database/model/triggers/C_TAX_TRG.xml
database/model/triggers/C_UOM_TRG.xml
database/model/triggers/C_VALIDCOMBINATION_TRG.xml
database/model/triggers/C_WITHHOLDING_TRG.xml
database/model/triggers/GL_JL_CHK_RESTRICTIONS_TRG.xml
database/model/triggers/GL_JOURNALLINE2_TRG.xml
database/model/triggers/GL_JOURNALLINE_TRG.xml
database/model/triggers/GL_JOURNAL_CHK_RESTRICT_TRG.xml
database/model/triggers/GL_JOURNAL_TRG.xml
database/model/triggers/M_ATTRIBUTEVALUE_TRG.xml
database/model/triggers/M_INOUTLINE_TRG.xml
database/model/triggers/M_INOUT_CHK_RESTRICTIONS_TRG.xml
database/model/triggers/M_INOUT_TRG_PROV.xml
database/model/triggers/M_INTERNAL_CONSUMPTIONLINE_TRG.xml
database/model/triggers/M_INVENTORYLINE2_TRG.xml
database/model/triggers/M_INVENTORYLINE_TRG.xml
database/model/triggers/M_INVENTORY_TRG.xml
database/model/triggers/M_IOLINE_CHK_RESTRICTIONS_TRG.xml
database/model/triggers/M_MATCHPO_TRG.xml
database/model/triggers/M_MOVEMENTLINE_TRG.xml
database/model/triggers/M_MOVEMENT_TRG.xml
database/model/triggers/M_PRODUCTIONLINE_TRG.xml
database/model/triggers/M_PRODUCTIONPLAN_TRG.xml
database/model/triggers/M_PRODUCTION_TRG.xml
database/model/triggers/M_PRODUCT_BOM_TRG.xml
database/model/triggers/M_PRODUCT_CATEGORY_TRG.xml
database/model/triggers/M_PRODUCT_TRG.xml
database/model/triggers/M_RAPPEL_INVOICE_TRG.xml
database/model/triggers/M_TRANSACTION_TRG.xml
database/model/triggers/M_WAREHOUSE_TRG.xml
database/model/triggers/S_EXPENSETYPE_TRG.xml
database/model/triggers/S_RESOURCEASSIGNMENT_TRG.xml
database/model/triggers/S_RESOURCETYPE_TRG.xml
database/model/triggers/S_RESOURCEUNAVAILABLE_TRG.xml
database/model/triggers/S_RESOURCE_TRG.xml
database/model/triggers/S_TIMEEXPENSELINE_TRG.xml
database/model/triggers/S_TIMEEXPENSE_TRG.xml
database/model/views/AD_FIELD_V.xml
database/model/views/AD_FIELD_VT.xml
database/model/views/AD_INTEGER.xml
database/model/views/AD_REF_LIST_V.xml
database/model/views/AD_TABLE_POST_V.xml
database/model/views/AD_TAB_V.xml
database/model/views/AD_TAB_VT.xml
database/model/views/AD_USER_ROLES_V.xml
database/model/views/AD_WINDOW_VT.xml
database/model/views/A_ASSET_AMORTIZATION.xml
database/model/views/C_DEBT_PAYMENT_CANCEL.xml
database/model/views/C_DEBT_PAYMENT_GENERATE.xml
database/model/views/C_DEBT_PAYMENT_V.xml
database/model/views/C_INVOICELINE_V.xml
database/model/views/C_INVOICE_CANDIDATE_V.xml
database/model/views/C_INVOICE_HEADER_V.xml
database/model/views/C_INVOICE_HEADER_VT.xml
database/model/views/C_INVOICE_LINETAX_V.xml
database/model/views/C_INVOICE_LINETAX_VT.xml
database/model/views/C_INVOICE_V.xml
database/model/views/C_ORDER_HEADER_V.xml
database/model/views/C_ORDER_HEADER_VT.xml
database/model/views/C_ORDER_LINETAX_V.xml
database/model/views/C_ORDER_LINETAX_VT.xml
database/model/views/C_PROJECT_DETAILS_V.xml
database/model/views/C_PROJECT_DETAILS_VT.xml
database/model/views/C_PROJECT_HEADER_V.xml
database/model/views/C_PROJECT_HEADER_VT.xml
database/model/views/GL_JOURNALLINE_ACCT_V.xml
database/model/views/MA_PROCESSPLAN_TOTALIZED.xml
database/model/views/MA_SEQUENCE_EMPLOYEE_COST.xml
database/model/views/MA_SEQUENCE_INDIRECT_COST_COST.xml
database/model/views/MA_SEQUENCE_MACHINE_COST.xml
database/model/views/M_INOUT_CANDIDATE_V.xml
database/model/views/M_INOUT_HEADER_V.xml
database/model/views/M_INOUT_HEADER_VT.xml
database/model/views/M_INOUT_LINE_V.xml
database/model/views/M_INOUT_LINE_VT.xml
database/model/views/REPORT_PROJECTPROPOSAL.xml
database/model/views/RV_ASSET_CUSTOMER.xml
database/model/views/RV_ASSET_DELIVERY.xml
database/model/views/RV_BPARTNER.xml
database/model/views/RV_CASH_DETAIL.xml
database/model/views/RV_C_INVOICE.xml
database/model/views/RV_C_INVOICELINE.xml
database/model/views/RV_C_INVOICE_CUSTOMERPRODQTR.xml
database/model/views/RV_C_INVOICE_CUSTOMERVENDQTR.xml
database/model/views/RV_C_INVOICE_DAY.xml
database/model/views/RV_C_INVOICE_MONTH.xml
database/model/views/RV_C_INVOICE_PRODMONTH.xml
database/model/views/RV_C_INVOICE_PRODWEEK.xml
database/model/views/RV_C_INVOICE_VENDORMONTH.xml
database/model/views/RV_C_INVOICE_WEEK.xml
database/model/views/RV_M_TRANSACTION.xml
database/model/views/RV_M_TRANSACTION_SUM.xml
database/model/views/RV_ORDER_OPEN.xml
database/model/views/RV_PRODUCT_COSTING.xml
database/model/views/RV_PROJECTCYCLE.xml
database/model/views/R_REQUEST_V.xml
database/model/views/S_TIMEEXPENSELINE_V.xml
--- a/database/model/functions/ADD_MONTHS2.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/ADD_MONTHS2.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -3,7 +3,7 @@
     <function name="ADD_MONTHS2" type="TIMESTAMP">
       <parameter name="pDate" type="TIMESTAMP" mode="in"/>
       <parameter name="pMonths" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -30,13 +30,14 @@
     return add_months(pdate, pMonths);
   else
     pDateAux := add_months(pDate, pMonths);
-    if (to_number(to_char(pDateAux,'DD'))&gt;to_number(to_char(pDate,'DD'))) then
+    if (to_number(to_char(pDateAux,'DD'))>to_number(to_char(pDate,'DD'))) then
       return to_date(to_char(pDate,'DD')||to_char(pDateAux,'-MM-YYYY'),'DD-MM-YYYY');
     else
       return pDateAux;
     end if;
   end if;
 END ADD_MONTHS2
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_APPLICATION_IMPORT.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_APPLICATION_IMPORT.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -16,7 +16,7 @@
       <parameter name="p_sequenceIdFrom" type="NUMERIC" mode="in"/>
       <parameter name="p_sequenceIdTo" type="NUMERIC" mode="in"/>
       <parameter name="p_baseinstalation" type="CHAR" mode="in"/>
-      <body>/************************************************************************* 
+      <body><![CDATA[/************************************************************************* 
 * 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 
@@ -279,10 +279,10 @@
  LOADSEQ, ISSECURITYENABLED, ISDELETEABLE, ISHIGHVOLUME, IMPORTTABLE, ISCHANGELOG, REPLICATIONTYPE, 
  PO_WINDOW_ID, ISDEFAULTACCT) 
  SELECT AD_TABLE_ID+v_tableOffset, 0, 0, ISACTIVE, now(), 0, now(), 0, 
- NAME, DESCRIPTION, HELP, TABLENAME, ISVIEW, ACCESSLEVEL, ENTITYTYPE, CASE WHEN AD_WINDOW_ID&gt;699999 
+ NAME, DESCRIPTION, HELP, TABLENAME, ISVIEW, ACCESSLEVEL, ENTITYTYPE, CASE WHEN AD_WINDOW_ID>699999 
  THEN AD_WINDOW_ID+v_windowOffset ELSE AD_WINDOW_ID END, AD_VAL_RULE_ID+v_valruleOffset, 
  LOADSEQ, ISSECURITYENABLED, ISDELETEABLE, ISHIGHVOLUME, IMPORTTABLE, ISCHANGELOG, REPLICATIONTYPE, 
- CASE WHEN PO_WINDOW_ID&gt;699999 THEN PO_WINDOW_ID+v_windowOffset ELSE PO_WINDOW_ID END, ISDEFAULTACCT 
+ CASE WHEN PO_WINDOW_ID>699999 THEN PO_WINDOW_ID+v_windowOffset ELSE PO_WINDOW_ID END, ISDEFAULTACCT 
  FROM TAD_AUX.AD_TABLE WHERE AD_TABLE_ID BETWEEN p_tableIdFrom AND p_tableIdTo; 
  
  --AD_Column 
@@ -294,11 +294,11 @@
  ISSYNCDATABASE, ISSESSIONATTR, ISSECONDARYKEY) 
  SELECT AD_COLUMN_ID+v_columnOffset, 0, 0, ISACTIVE, now(), now(), 0, 0, 
  NAME, DESCRIPTION, HELP, VERSION, ENTITYTYPE, COLUMNNAME, AD_TABLE_ID+v_tableOffset, 
- CASE WHEN AD_REFERENCE_ID&gt;699999 THEN AD_REFERENCE_ID+v_referenceOffset ELSE AD_REFERENCE_ID END, 
- CASE WHEN AD_REFERENCE_VALUE_ID&gt;699999 THEN AD_REFERENCE_VALUE_ID+v_referenceOffset ELSE AD_REFERENCE_VALUE_ID END, 
- CASE WHEN AD_VAL_RULE_ID&gt;699999 THEN AD_VAL_RULE_ID+v_valruleOffset ELSE AD_VAL_RULE_ID END, FIELDLENGTH, DEFAULTVALUE, ISKEY, ISPARENT, 
+ CASE WHEN AD_REFERENCE_ID>699999 THEN AD_REFERENCE_ID+v_referenceOffset ELSE AD_REFERENCE_ID END, 
+ CASE WHEN AD_REFERENCE_VALUE_ID>699999 THEN AD_REFERENCE_VALUE_ID+v_referenceOffset ELSE AD_REFERENCE_VALUE_ID END, 
+ CASE WHEN AD_VAL_RULE_ID>699999 THEN AD_VAL_RULE_ID+v_valruleOffset ELSE AD_VAL_RULE_ID END, FIELDLENGTH, DEFAULTVALUE, ISKEY, ISPARENT, 
  ISMANDATORY, ISUPDATEABLE, READONLYLOGIC, ISIDENTIFIER, SEQNO, ISTRANSLATED, ISENCRYPTED, 
- CALLOUT, VFORMAT, VALUEMIN, VALUEMAX, ISSELECTIONCOLUMN, CASE WHEN AD_ELEMENT_ID&gt;699999 
+ CALLOUT, VFORMAT, VALUEMIN, VALUEMAX, ISSELECTIONCOLUMN, CASE WHEN AD_ELEMENT_ID>699999 
  THEN AD_ELEMENT_ID+v_elementOffset ELSE AD_ELEMENT_ID END, AD_PROCESS_ID+v_processOffset, 
  ISSYNCDATABASE, ISSESSIONATTR, ISSECONDARYKEY 
  FROM TAD_AUX.AD_COLUMN WHERE AD_TABLE_ID BETWEEN p_tableIdFrom AND p_tableIdTo; 
@@ -311,7 +311,7 @@
  COMMITWARNING, AD_PROCESS_ID, PROCESSING, AD_IMAGE_ID, IMPORTFIELDS, AD_COLUMNSORTORDER_ID, 
  AD_COLUMNSORTYESNO_ID, ISSORTTAB, ENTITYTYPE, INCLUDED_TAB_ID, FILTERCLAUSE) 
  SELECT AD_TAB_ID+v_tabOffset, 0, 0, ISACTIVE, now(), 0, now(), 
- 0, NAME, DESCRIPTION, HELP, AD_TABLE_ID+v_tableOffset, CASE WHEN AD_WINDOW_ID&gt;699999 
+ 0, NAME, DESCRIPTION, HELP, AD_TABLE_ID+v_tableOffset, CASE WHEN AD_WINDOW_ID>699999 
  THEN AD_WINDOW_ID+v_windowOffset ELSE AD_WINDOW_ID END, SEQNO, TABLEVEL, 
  ISSINGLEROW, ISINFOTAB, ISTRANSLATIONTAB, ISREADONLY, AD_COLUMN_ID+v_columnOffset, HASTREE, WHERECLAUSE, 
  ORDERBYCLAUSE, COMMITWARNING, AD_PROCESS_ID+v_processOffset, PROCESSING, AD_IMAGE_ID, IMPORTFIELDS, 
@@ -413,8 +413,8 @@
  UPDATED, UPDATEDBY, AD_TABLE_ID, AD_KEY, AD_DISPLAY, ISVALUEDISPLAYED, WHERECLAUSE, ORDERBYCLAUSE, 
  ENTITYTYPE) 
  SELECT AD_REFERENCE_ID+v_referenceOffset, 0, 0, ISACTIVE, now(), 0, now(), 0, 
- AD_TABLE_ID+v_tableOffset, CASE WHEN AD_KEY&gt;699999 THEN AD_KEY+v_columnOffset ELSE AD_KEY END, 
- CASE WHEN AD_DISPLAY&gt;699999 THEN AD_DISPLAY+v_columnOffset ELSE AD_DISPLAY END, 
+ AD_TABLE_ID+v_tableOffset, CASE WHEN AD_KEY>699999 THEN AD_KEY+v_columnOffset ELSE AD_KEY END, 
+ CASE WHEN AD_DISPLAY>699999 THEN AD_DISPLAY+v_columnOffset ELSE AD_DISPLAY END, 
  ISVALUEDISPLAYED, WHERECLAUSE, ORDERBYCLAUSE, ENTITYTYPE 
  FROM TAD_AUX.AD_REF_TABLE WHERE AD_REFERENCE_ID BETWEEN p_referenceIdFrom AND p_referenceIdTo; 
  
@@ -456,7 +456,7 @@
  INSERT INTO AD_TREENODE (AD_TREE_ID, NODE_ID, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE, CREATED, 
  CREATEDBY, UPDATED, UPDATEDBY, PARENT_ID, SEQNO) 
  SELECT AD_TREE_ID, NODE_ID+v_menuOffset, 0, 0, ISACTIVE, now(), 0, now(), 0, 
- CASE WHEN PARENT_ID&gt;699999 THEN PARENT_ID+v_menuOffset ELSE PARENT_ID END, SEQNO 
+ CASE WHEN PARENT_ID>699999 THEN PARENT_ID+v_menuOffset ELSE PARENT_ID END, SEQNO 
  FROM TAD_AUX.AD_TREENODE WHERE NODE_ID BETWEEN p_menuIdFrom AND p_menuIdTo; 
  
  --ad_val_rule 
@@ -549,6 +549,7 @@
  
 END AD_Application_Import
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_COLUMN_FORMAT.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_COLUMN_FORMAT.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -4,7 +4,7 @@
       <parameter name="p_ColumnName" type="VARCHAR" mode="in"/>
       <parameter name="p_Reference_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_IsData" type="CHAR" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -45,6 +45,7 @@
   WHEN OTHERS THEN
     RETURN v_Column;
 END AD_COLUMN_FORMAT
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_COLUMN_IDENTIFIER.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_COLUMN_IDENTIFIER.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -4,7 +4,7 @@
       <parameter name="p_TableName" type="VARCHAR" mode="in"/>
       <parameter name="p_Record_ID" type="VARCHAR" mode="in"/>
       <parameter name="p_Language" type="VARCHAR" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -31,12 +31,13 @@
   /*  IF (p_Language=NULL OR p_Language='' ) THEN
   v_Display:='**';
   END IF;*/
---  &lt;&lt; END_PROCESS &gt;&gt;
+--  << END_PROCESS >>
   RETURN v_Display;
 EXCEPTION
 WHEN OTHERS THEN
   RETURN '**';
 END AD_COLUMN_IDENTIFIER 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_COLUMN_IDENTIFIER_REF_SQL.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_COLUMN_IDENTIFIER_REF_SQL.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -6,7 +6,7 @@
       <parameter name="p_ColumnName" type="VARCHAR" mode="in"/>
       <parameter name="p_Reference_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_Reference_Value_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -113,7 +113,7 @@
             AND(c.ISKEY='Y'
             OR c.ISSECONDARYKEY='Y')
             AND c.ISPARENT='Y'
-            AND UPPER(c.COLUMNNAME) &lt;&gt; 'AD_LANGUAGE';
+            AND UPPER(c.COLUMNNAME) <> 'AD_LANGUAGE';
           v_SQL:='(SELECT COALESCE(TO_CHAR(MAX(' || p_TableRef || 'T.' || v_NewColumnName || ')), TO_CHAR(' || p_TableRef || '.' || p_ColumnName || ')) FROM ' || v_NewTableName || ' ' || p_TableRef || 'T WHERE '|| p_TableRef||'T.' || v_FieldValue || '='|| p_TableRef||'.'|| v_FieldValue || ' AND ' || p_TableRef || 'T.AD_LANGUAGE=L.AD_LANGUAGE) ';
         END IF;
       END IF;
@@ -171,12 +171,13 @@
       END IF; --END_PROCESS
     END;
   END IF;
-  --&lt;&lt;END_PROCESS&gt;&gt;
+  --<<END_PROCESS>>
   RETURN v_SQL;
   /*EXCEPTION
   WHEN OTHERS THEN
   RETURN '**'; */
 END AD_COLUMN_IDENTIFIER_REF_SQL
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_COLUMN_IDENTIFIER_SQL.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_COLUMN_IDENTIFIER_SQL.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION AD_COLUMN_IDENTIFIER_SQL">
     <function name="AD_COLUMN_IDENTIFIER_SQL" type="VARCHAR">
       <parameter name="p_TableName" type="VARCHAR" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -67,12 +67,13 @@
     ELSE
       v_SQL:='**No key found';
     END IF;
---    &lt;&lt; END_PROCESS &gt;&gt;
+--    << END_PROCESS >>
     RETURN v_SQL;
 EXCEPTION
   WHEN OTHERS THEN
     RETURN '**';
 END AD_COLUMN_IDENTIFIER_SQL
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_COLUMN_IDENTIFIER_STD.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_COLUMN_IDENTIFIER_STD.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -3,7 +3,7 @@
     <function name="AD_COLUMN_IDENTIFIER_STD" type="VARCHAR">
       <parameter name="p_TableName" type="VARCHAR" mode="in"/>
       <parameter name="p_Record_ID" type="VARCHAR" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -33,6 +33,7 @@
 WHEN OTHERS THEN
   RETURN '**';
 END AD_COLUMN_IDENTIFIER_STD
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_COLUMN_SYNC.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_COLUMN_SYNC.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION AD_COLUMN_SYNC">
     <function name="AD_COLUMN_SYNC" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   * Version 2.5.0 ("License"); You may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
@@ -11,7 +11,7 @@
   * "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  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -139,7 +139,7 @@
      v_Message:='DisplayType Not Supported';
    END IF;
    -- Default (literal)
-   IF(v_DefaultValue IS NOT NULL AND LENGTH(v_DefaultValue)&lt;&gt;0) THEN
+   IF(v_DefaultValue IS NOT NULL AND LENGTH(v_DefaultValue)<>0) THEN
      IF(v_AD_Reference_ID IN(10, 14, 17, 20, 28)) THEN
        v_Cmd:=v_Cmd || ' DEFAULT (''' || v_DefaultValue || ''')';
      ELSE
@@ -194,7 +194,7 @@
      v_Message:='DisplayType Not Supported';
    END IF;
    -- Default (literal)
-   IF(v_DefaultValue IS NOT NULL AND LENGTH(v_DefaultValue)&lt;&gt;0) THEN
+   IF(v_DefaultValue IS NOT NULL AND LENGTH(v_DefaultValue)<>0) THEN
      IF(v_AD_Reference_ID IN(10, 14, 17, 20, 28)) THEN
        v_Cmd:=v_Cmd || ' DEFAULT (''' || v_DefaultValue || ''')';
      ELSE
@@ -244,7 +244,7 @@
  END;
  END IF;
  END IF; --FINISH_PROCESS
- --&lt;&lt;FINISH_PROCESS&gt;&gt;
+ --<<FINISH_PROCESS>>
  --  Update AD_PInstance
  DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
  AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'N', v_Result, v_Message) ;
@@ -258,6 +258,7 @@
   AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'N', 0, v_ResultStr) ;
   RETURN;
 END AD_Column_Sync
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_COPY_CLIENT.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_COPY_CLIENT.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION AD_COPY_CLIENT">
     <function name="AD_COPY_CLIENT" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -213,7 +213,7 @@
       FOR Cur_Columns IN
         (SELECT UPPER(COLUMNNAME) AS NAME
       FROM AD_Column
-      WHERE AD_Table_ID=Cur_RoleTables.AD_Table_ID AND UPPER(ColumnName)&lt;&gt;'AD_CLIENT_ID' AND(UPPER(ColumnName)&lt;&gt;'' OR '' IS NULL)
+      WHERE AD_Table_ID=Cur_RoleTables.AD_Table_ID AND UPPER(ColumnName)<>'AD_CLIENT_ID' AND(UPPER(ColumnName)<>'' OR '' IS NULL)
       ORDER BY UPPER(COLUMNNAME))
       LOOP
         v_strTemp:=v_strTemp ||','|| Cur_Columns.NAME;
@@ -239,7 +239,7 @@
     ORDER BY TableName)
     LOOP
       EXECUTE IMMEDIATE 'SELECT COUNT(*) FROM '||Cur_Tables.NAME||' WHERE AD_Client_ID = '||p_AD_Client_ID INTO v_count;
-      IF(v_count&gt;0) THEN
+      IF(v_count>0) THEN
         SELECT MAX(UPPER(ColumnName))
         INTO v_ID_Column
         FROM AD_Column
@@ -262,7 +262,7 @@
         FOR Cur_Columns IN
           (SELECT UPPER(COLUMNNAME) AS NAME
         FROM AD_Column
-        WHERE AD_Table_ID=Cur_Tables.AD_Table_ID AND UPPER(ColumnName)&lt;&gt;'AD_CLIENT_ID' AND(UPPER(ColumnName)&lt;&gt;v_ID_Column OR v_ID_Column IS NULL)
+        WHERE AD_Table_ID=Cur_Tables.AD_Table_ID AND UPPER(ColumnName)<>'AD_CLIENT_ID' AND(UPPER(ColumnName)<>v_ID_Column OR v_ID_Column IS NULL)
         ORDER BY UPPER(COLUMNNAME))
         LOOP
           v_strTemp:=v_strTemp ||','|| Cur_Columns.NAME;
@@ -287,10 +287,10 @@
     FOR Cur_TranslateData IN
       (SELECT AD_DEPENDENCIES.TABLENAME, AD_DEPENDENCIES.COLUMNNAME, AD_DEPENDENCIES.DEPENDS_ON_TABLENAME, AD_DEPENDENCIES.DEPENDS_ON_COLUMNNAME, AD_ID_TRANSLATION."OFFSET"
     FROM AD_DEPENDENCIES, AD_ID_TRANSLATION
-    WHERE AD_DEPENDENCIES.DEPENDS_ON_TABLENAME=AD_ID_TRANSLATION.AD_TABLE AND AD_DEPENDENCIES.DEPENDS_ON_TABLENAME&lt;&gt;AD_DEPENDENCIES.TABLENAME AND AD_DEPENDENCIES.DEPENDS_ON_COLUMNNAME=AD_ID_TRANSLATION.AD_COLUMN
+    WHERE AD_DEPENDENCIES.DEPENDS_ON_TABLENAME=AD_ID_TRANSLATION.AD_TABLE AND AD_DEPENDENCIES.DEPENDS_ON_TABLENAME<>AD_DEPENDENCIES.TABLENAME AND AD_DEPENDENCIES.DEPENDS_ON_COLUMNNAME=AD_ID_TRANSLATION.AD_COLUMN
     ORDER BY AD_DEPENDENCIES.TABLENAME, AD_DEPENDENCIES.COLUMNNAME)
     LOOP
-      IF(Cur_TranslateData.TABLENAME&lt;&gt;v_tableActual OR v_count&gt;20) THEN
+      IF(Cur_TranslateData.TABLENAME<>v_tableActual OR v_count>20) THEN
         v_count:=0;
         v_tableActual:=Cur_TranslateData.TABLENAME;
         IF(v_strSql IS NOT NULL) THEN
@@ -318,7 +318,7 @@
     WHERE AD_DEPENDENCIES.DEPENDS_ON_TABLENAME=AD_ID_TRANSLATION.AD_TABLE AND AD_DEPENDENCIES.DEPENDS_ON_TABLENAME=AD_DEPENDENCIES.TABLENAME AND AD_DEPENDENCIES.DEPENDS_ON_COLUMNNAME=AD_ID_TRANSLATION.AD_COLUMN
     ORDER BY AD_DEPENDENCIES.TABLENAME, AD_DEPENDENCIES.COLUMNNAME)
     LOOP
-      IF(Cur_TranslateDataSelfDep.TABLENAME&lt;&gt;v_tableActual OR v_count&gt;20) THEN
+      IF(Cur_TranslateDataSelfDep.TABLENAME<>v_tableActual OR v_count>20) THEN
         v_count:=0;
         v_tableActual:=Cur_TranslateDataSelfDep.TABLENAME;
         IF(v_strSql IS NOT NULL) THEN
@@ -531,9 +531,9 @@
     WHEN OTHERS THEN
       v_Result:=0;
       if (coalesce(length(v_Message),0)!=0) then
-        v_Message:=substr(v_Message||'&lt;br&gt;&lt;br&gt;',1,2000);
+        v_Message:=substr(v_Message||'<br><br>',1,2000);
       end if;
-      v_Message := substr(v_Message||'@SQLScriptError@ '||Cur_Script.SeqNo||'. @Executing@'||Cur_Script.strSQL||'&lt;br&gt;'||SQLERRM,1,2000);
+      v_Message := substr(v_Message||'@SQLScriptError@ '||Cur_Script.SeqNo||'. @Executing@'||Cur_Script.strSQL||'<br>'||SQLERRM,1,2000);
     END;
   END LOOP;
 
@@ -542,28 +542,28 @@
    into v_count
     from user_constraints
    where status!='ENABLED';
-  if v_count&gt;0 then
+  if v_count>0 then
     if v_Result!=0 then
       v_Result:=2;
     end if;
-    v_Message:=substr(v_Message||'&lt;br&gt;&lt;br&gt;@ProcessLeft@ '||v_count||' @DisabledConstraints@',1,2000);
+    v_Message:=substr(v_Message||'<br><br>@ProcessLeft@ '||v_count||' @DisabledConstraints@',1,2000);
   end if;
 
   select count(*)
   into v_count
     from user_triggers
     where status!='ENABLED';
-  if v_count&gt;0 then
+  if v_count>0 then
     if v_Result!=0 then
       v_Result:=2;
     end if;
-    v_Message:=substr(v_Message||'&lt;br&gt;&lt;br&gt;@ProcessLeft@ '||v_count||' @DisabledTriggers@',1,2000);
+    v_Message:=substr(v_Message||'<br><br>@ProcessLeft@ '||v_count||' @DisabledTriggers@',1,2000);
   end if;
 
-  --&lt;&lt;END_PROCESS&gt;&gt;
+  --<<END_PROCESS>>
   IF(p_PInstance_ID IS NOT NULL) THEN
     --  Update AD_PInstance
-    if (coalesce(length(v_Message),0)&gt;=1997) then
+    if (coalesce(length(v_Message),0)>=1997) then
       v_Message:=substr(v_Message,1,1997)||'...';
     end if;
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
@@ -584,6 +584,7 @@
   END IF;
 END AD_Copy_Client
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_DELETE_CLIENT.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_DELETE_CLIENT.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -3,7 +3,7 @@
     <function name="AD_DELETE_CLIENT" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_AD_Client_ID" type="NUMERIC" mode="in"/>
-      <body>/************************************************************************* 
+      <body><![CDATA[/************************************************************************* 
 * 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 
@@ -112,7 +112,7 @@
     FOR Cur_Tables IN 
       (SELECT AD_Table_ID, UPPER(TableName) AS NAME 
     FROM AD_Table 
-    WHERE IsView='N'  AND UPPER(TableName)&lt;&gt;'AD_CLIENT'  AND EXISTS 
+    WHERE IsView='N'  AND UPPER(TableName)<>'AD_CLIENT'  AND EXISTS 
       (SELECT 1 
       FROM AD_Column 
       WHERE AD_Table_ID=AD_Table.AD_Table_ID  AND UPPER(ColumnName)='AD_CLIENT_ID' 
@@ -166,9 +166,9 @@
     WHEN OTHERS THEN 
       v_Result:=0;
       if (coalesce(length(v_Message),0)!=0) then
-        v_Message:=substr(v_Message||'&lt;br&gt;&lt;br&gt;',1,2000);
+        v_Message:=substr(v_Message||'<br><br>',1,2000);
       end if;
-      v_Message := substr(v_Message||'@SQLScriptError@ '||Cur_Script.SeqNo||'. @Executing@'||Cur_Script.strSQL||'&lt;br&gt;'||SQLERRM,1,2000);
+      v_Message := substr(v_Message||'@SQLScriptError@ '||Cur_Script.SeqNo||'. @Executing@'||Cur_Script.strSQL||'<br>'||SQLERRM,1,2000);
     END;
   END LOOP;
 
@@ -176,24 +176,24 @@
    into v_count
     from user_constraints
    where status!='ENABLED';
-  if v_count&gt;0 then
+  if v_count>0 then
     v_Result:=0;
-    v_Message:=substr(v_Message||'&lt;br&gt;&lt;br&gt;@ProcessLeft@ '||v_count||' @DisabledConstraints@',1,2000);
+    v_Message:=substr(v_Message||'<br><br>@ProcessLeft@ '||v_count||' @DisabledConstraints@',1,2000);
   end if;
 
   select count(*)
   into v_count
     from user_triggers
     where status!='ENABLED';
-  if v_count&gt;0 then
+  if v_count>0 then
     v_Result:=0;
-    v_Message:=substr(v_Message||'&lt;br&gt;&lt;br&gt;@ProcessLeft@ '||v_count||' @DisabledTriggers@',1,2000);
+    v_Message:=substr(v_Message||'<br><br>@ProcessLeft@ '||v_count||' @DisabledTriggers@',1,2000);
   end if;
 
-   --&lt;&lt;END_PROCESS&gt;&gt;
+   --<<END_PROCESS>>
   IF(p_PInstance_ID IS NOT NULL) THEN
     --  Update AD_PInstance
-    if (coalesce(length(v_Message),0)&gt;=1997) then
+    if (coalesce(length(v_Message),0)>=1997) then
         v_Message:=substr(v_Message,1,1997)||'...';
       end if;
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
@@ -215,6 +215,7 @@
   END IF;
 --  RETURN;
 END AD_Delete_Client
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_DELETE_CLIENT0.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_DELETE_CLIENT0.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION AD_DELETE_CLIENT0">
     <function name="AD_DELETE_CLIENT0" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/************************************************************************* 
+      <body><![CDATA[/************************************************************************* 
  * 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 
@@ -26,6 +26,7 @@
 BEGIN 
  AD_Delete_Client (p_PInstance_ID, NULL); 
 END AD_Delete_Client0
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_DEPENDENCIES_CREATE.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_DEPENDENCIES_CREATE.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
   <database name="FUNCTION AD_DEPENDENCIES_CREATE">
     <function name="AD_DEPENDENCIES_CREATE" type="NULL">
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
  * 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
@@ -145,6 +145,7 @@
 
 END AD_Dependencies_Create
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_DEVELOPMENT_MIGRATION.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_DEVELOPMENT_MIGRATION.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION AD_DEVELOPMENT_MIGRATION">
     <function name="AD_DEVELOPMENT_MIGRATION" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -129,7 +129,7 @@
     ORDER BY TableName)
     LOOP
       EXECUTE IMMEDIATE 'SELECT COUNT(*) FROM '||Cur_Tables.NAME||' WHERE '||Cur_Tables.COL_ID||' BETWEEN '||v_min||' AND ' ||v_max INTO v_count;
-      IF(v_count&gt;0) THEN
+      IF(v_count>0) THEN
         EXECUTE IMMEDIATE 'SELECT MIN('||Cur_Tables.COL_ID||') FROM '||Cur_Tables.NAME||' WHERE '||Cur_Tables.COL_ID||' BETWEEN '||v_min||' AND ' ||v_max INTO v_minID;
         SELECT CurrentNextSys
         INTO v_nextID
@@ -158,7 +158,7 @@
     ORDER BY AD_DEPENDENCIES.TABLENAME, AD_DEPENDENCIES.COLUMNNAME)
     LOOP
       EXECUTE IMMEDIATE 'SELECT count(*) FROM ' || Cur_TranslateData.TABLENAME || ' WHERE ' || Cur_TranslateData.COLUMNNAME || ' BETWEEN ' || v_min || ' AND ' || v_max INTO v_count;
-      IF(v_count&gt;0) THEN
+      IF(v_count>0) THEN
         v_strSql:='UPDATE ' || Cur_TranslateData.TABLENAME || ' SET ' || Cur_TranslateData.COLUMNNAME || ' = ' || Cur_TranslateData.COLUMNNAME || ' + ' || Cur_TranslateData."OFFSET";
         v_strSql:=v_strSql || 'WHERE ' || Cur_TranslateData.COLUMNNAME || ' BETWEEN ' ||v_min||' AND ' ||v_max;
         v_seqNo:=v_seqNo + 1;
@@ -170,7 +170,7 @@
     INTO v_count
     FROM AD_Treenode
     WHERE Node_ID BETWEEN v_min AND v_max;
-    IF(v_count&gt;0) THEN
+    IF(v_count>0) THEN
       SELECT max("OFFSET")
       INTO v_Offset
       FROM AD_ID_TRANSLATION
@@ -184,7 +184,7 @@
     INTO v_count
     FROM AD_Treenode
     WHERE Parent_ID BETWEEN v_min AND v_max;
-    IF(v_count&gt;0) THEN
+    IF(v_count>0) THEN
       SELECT max("OFFSET")
       INTO v_Offset
       FROM AD_ID_TRANSLATION
@@ -234,7 +234,7 @@
       DBMS_OUTPUT.PUT_LINE(Cur_Script.SEQNO || ' - ' || v_ResultStr) ;
     END;
   END LOOP;
-  --&lt;&lt;END_PROCESS&gt;&gt;
+  --<<END_PROCESS>>
   IF(p_PInstance_ID IS NOT NULL) THEN
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
@@ -255,6 +255,7 @@
   END IF;
 END AD_Development_Migration
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_DISPLAY_LIST.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_DISPLAY_LIST.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -4,7 +4,7 @@
       <parameter name="p_ReferenceValue_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_Value" type="NVARCHAR" mode="in"/>
       <parameter name="p_AD_Language" type="VARCHAR" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -44,6 +44,7 @@
 WHEN OTHERS THEN
   RETURN 'Not found!!!';
 END AD_Display_List
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_GET_DOCTYPE.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_GET_DOCTYPE.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -5,7 +5,7 @@
       <parameter name="p_OrgId" type="NUMERIC" mode="in"/>
       <parameter name="p_DocBaseType" type="CHAR" mode="in"/>
       <parameter name="p_DocSubTypeSO" type="CHAR" mode="in" default="NULL"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -32,7 +32,7 @@
         AND(p_DocSubTypeSO IS NULL
         OR DOCSUBTYPESO=p_DocSubTypeSO)
         AND AD_Client_Id=p_ClientId
-        AND AD_ISORGINCLUDED(p_OrgId, AD_Org_ID, p_ClientId) &lt;&gt; -1
+        AND AD_ISORGINCLUDED(p_OrgId, AD_Org_ID, p_ClientId) <> -1
       ORDER BY AD_ISORGINCLUDED(p_OrgId, AD_Org_ID, p_ClientId),
         IsDefault,
         C_DocType_ID
@@ -43,6 +43,7 @@
     END LOOP;
     RETURN v_DocTypeId;
 END Ad_Get_DocType 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_GET_NEXT_SEQUENCE.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_GET_NEXT_SEQUENCE.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -3,7 +3,7 @@
     <function name="AD_GET_NEXT_SEQUENCE" type="NUMERIC">
       <parameter name="p_TableName" type="VARCHAR" mode="in"/>
       <parameter name="p_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -29,7 +29,7 @@
   FROM AD_SEQUENCE
   WHERE NAME=p_TableName AND IsActive='Y' AND IsTableID='Y' AND IsAutoSequence='Y';
   v_ResultStr:='Write';
-  IF(v_NextNoSys &lt;&gt; -1 AND p_ID &lt; 1000000) THEN -- System No
+  IF(v_NextNoSys <> -1 AND p_ID < 1000000) THEN -- System No
     UPDATE AD_SEQUENCE
       SET CurrentNextSys=CurrentNextSys + IncrementNo,
       Updated=now()
@@ -48,6 +48,7 @@
   --   || v_ResultStr || ': ' || p_TableName);
   RETURN 0;
 END Ad_Get_Next_Sequence
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_IMPFORMAT_COPY.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_IMPFORMAT_COPY.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION AD_IMPFORMAT_COPY">
     <function name="AD_IMPFORMAT_COPY" type="NULL">
       <parameter name="PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   * Version 2.5.0 ("License"); You may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
@@ -11,7 +11,7 @@
   * "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  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -89,7 +89,7 @@
       v_NoOfFields:=v_NoOfFields + 1;
     END LOOP;
     v_Message:='@Copied@=' || v_NoOfFields;
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
     AD_UPDATE_PINSTANCE(PInstance_ID, NULL, 'N', 1, v_Message) ;
@@ -103,6 +103,7 @@
   RETURN;
 END AD_ImpFormat_Copy
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_ISMEMBERINCLUDED.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_ISMEMBERINCLUDED.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -4,7 +4,7 @@
       <parameter name="p_nodeID" type="NUMERIC" mode="in"/>
       <parameter name="p_parentID" type="NUMERIC" mode="in"/>
       <parameter name="p_treeID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -45,6 +45,7 @@
   END LOOP;
   RETURN(-1) ;
 END AD_IsMemberIncluded
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_ISORGINCLUDED.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_ISORGINCLUDED.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -4,7 +4,7 @@
       <parameter name="p_orgID" type="NUMERIC" mode="in"/>
       <parameter name="p_parentOrgID" type="NUMERIC" mode="in"/>
       <parameter name="p_clientID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -50,6 +50,7 @@
   END LOOP;
   RETURN(-1) ;
 END AD_IsOrgIncluded 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_LANGUAGE_CREATE.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_LANGUAGE_CREATE.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION AD_LANGUAGE_CREATE">
     <function name="AD_LANGUAGE_CREATE" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   * Version 2.5.0 ("License"); You may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
@@ -11,7 +11,7 @@
   * "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  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -534,7 +534,7 @@
     -- Summary info
     v_Message:='@Created@ = ' || v_Created;
     -- Commented by cromero 19102006 COMMIT;
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
     AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'N', v_Result, v_Message) ;
@@ -548,6 +548,7 @@
   AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'N', 0, v_ResultStr) ;
 -- Commented by cromero 19102006 RETURN;
 END AD_Language_Create
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_MAPPING_FORMAT.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_MAPPING_FORMAT.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION AD_MAPPING_FORMAT">
     <function name="AD_MAPPING_FORMAT" type="VARCHAR">
       <parameter name="p_str" type="VARCHAR"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -40,12 +40,13 @@
   v_str:=replace(v_str, '/', '') ;
   v_str:=replace(v_str, '#', '') ;
   v_str:=replace(v_str, ' ', '') ;
-  v_str:=replace(v_str, '&amp;', '') ;
+  v_str:=replace(v_str, '&', '') ;
   v_str:=replace(v_str, ',', '') ;
   v_str:=replace(v_str, '(', '') ;
   v_str:=replace(v_str, ')', '') ;
   RETURN(v_str) ;
 END AD_MAPPING_FORMAT
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_MESSAGE_GET.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_MESSAGE_GET.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -3,14 +3,14 @@
     <function name="AD_MESSAGE_GET" type="NVARCHAR">
       <parameter name="p_Value" type="NVARCHAR" mode="in"/>
       <parameter name="p_AD_Language" type="VARCHAR" mode="in"/>
-      <body>/******************************************************************************
+      <body><![CDATA[/******************************************************************************
 * The contents of this file are subject to the   Compiere License  Version 1.1
 * ("License"); You may not use this file except in compliance with the License
 * You may obtain a copy of the License at http://www.compiere.org/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                  Compiere  ERP &amp;  Business Solution
+* The Original Code is                  Compiere  ERP &  Business Solution
 * The Initial Developer of the Original Code is Jorg Janke  and ComPiere, Inc.
 * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
 * created by ComPiere are Copyright (C) ComPiere, Inc.;   All Rights Reserved.
@@ -24,20 +24,21 @@
   INTO v_RetValue
   FROM AD_Message
   WHERE Value = p_Value;
-  /*POSTGRESQL&gt;
+  /*POSTGRESQL>
   IF (NOT FOUND) THEN
-  RETURN &lt;' || p_Value || '&gt;';
+  RETURN <' || p_Value || '>';
   END IF;
-  &lt;POSTGRESQL*/
-  /*ORACLE&gt;*/
+  <POSTGRESQL*/
+  /*ORACLE>*/
 EXCEPTION
 WHEN OTHERS THEN
-  RETURN N'&lt;' || p_Value || N'&gt;';
-  /*&lt;ORACLE*/
+  RETURN N'<' || p_Value || N'>';
+  /*<ORACLE*/
 END;
 --
 RETURN v_RetValue;
 END AD_Message_Get
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_MESSAGE_GET2.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_MESSAGE_GET2.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -3,14 +3,14 @@
     <function name="AD_MESSAGE_GET2" type="NVARCHAR">
       <parameter name="p_Value" type="NVARCHAR" mode="in"/>
       <parameter name="p_AD_Language" type="VARCHAR" mode="in"/>
-      <body>/******************************************************************************
+      <body><![CDATA[/******************************************************************************
 * The contents of this file are subject to the   Compiere License  Version 1.1
 * ("License"); You may not use this file except in compliance with the License
 * You may obtain a copy of the License at http://www.compiere.org/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                  Compiere  ERP &amp;  Business Solution
+* The Original Code is                  Compiere  ERP &  Business Solution
 * The Initial Developer of the Original Code is Jorg Janke  and ComPiere, Inc.
 * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
 * created by ComPiere are Copyright (C) ComPiere, Inc.;   All Rights Reserved.
@@ -34,12 +34,12 @@
        AND AD_MESSAGE.VALUE = p_Value;
   END IF;
 
-  /*POSTGRESQL&gt;
+  /*POSTGRESQL>
   IF (NOT FOUND) THEN
-  RETURN &lt;' || p_Value || '&gt;';
+  RETURN <' || p_Value || '>';
   END IF;
-  &lt;POSTGRESQL*/
-  /*ORACLE&gt;*/
+  <POSTGRESQL*/
+  /*ORACLE>*/
 
 EXCEPTION
   WHEN OTHERS THEN
@@ -48,6 +48,7 @@
 --
 RETURN v_RetValue;
 END AD_MESSAGE_GET2
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_ORGLIST.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_ORGLIST.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION AD_ORGLIST">
     <function name="AD_ORGLIST" type="VARCHAR">
       <parameter name="p_roleID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -37,6 +37,7 @@
     END LOOP;
     RETURN SUBSTR(v_orgList, 2, 4000) ;
 END AD_OrgList
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_PARENT_MENU_ELEMENT.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_PARENT_MENU_ELEMENT.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -4,7 +4,7 @@
       <parameter name="p_NodeID" type="NUMERIC" mode="in"/>
       <parameter name="p_clientID" type="NUMERIC" mode="in"/>
       <parameter name="p_Language" type="VARCHAR" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -59,6 +59,7 @@
   END LOOP;
   RETURN(v_Name) ;
 END AD_PARENT_MENU_ELEMENT
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_PARENT_TREE.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_PARENT_TREE.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -3,7 +3,7 @@
     <function name="AD_PARENT_TREE" type="VARCHAR">
       <parameter name="p_tree_id" type="NUMERIC" mode="in"/>
       <parameter name="p_node_id" type="NUMERIC" mode="in"/>
-      <body>p VARCHAR2(32767);
+      <body><![CDATA[p VARCHAR2(32767);
   vp NUMBER(10);
 BEGIN
 
@@ -21,6 +21,7 @@
     RETURN '|'||vp||'|';
   EXCEPTION WHEN OTHERS THEN RETURN ' ';
 END AD_PARENT_TREE
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_PRINTPAPER_DEFAULT.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_PRINTPAPER_DEFAULT.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION AD_PRINTPAPER_DEFAULT">
     <function name="AD_PRINTPAPER_DEFAULT" type="NULL">
       <parameter name="p_AD_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   * Version 2.5.0 ("License"); You may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
@@ -11,7 +11,7 @@
   * "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  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -73,7 +73,7 @@
       ;
     rowcount:=SQL%ROWCOUNT;
     v_Message:='@Copied@=' || rowcount;
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
     AD_UPDATE_PINSTANCE(p_AD_PInstance_ID, NULL, 'N', 1, v_Message) ;
@@ -87,6 +87,7 @@
   RETURN;
 END AD_PrintPaper_Default
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_SEQUENCE_DOC.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_SEQUENCE_DOC.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -5,7 +5,7 @@
       <parameter name="p_AD_Client_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_Update_Next" type="CHAR" mode="in"/>
       <parameter name="p_DocumentNo" type="VARCHAR" mode="out"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   * Version 2.5.0 ("License"); You may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
@@ -14,7 +14,7 @@
   * "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  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -28,7 +28,7 @@
   * Title: Get the next DocumentNo of TableName
   * Description:
   *  store in parameter p_DocumentNo
-  *  if ID &lt; 1000000, use System Doc Sequence
+  *  if ID < 1000000, use System Doc Sequence
   ************************************************************************/
   v_NextNo NUMBER;
   v_NextNoSys NUMBER;
@@ -39,7 +39,7 @@
   INTO v_NextNo, v_NextNoSys, v_Prefix, v_Suffix
   FROM AD_Sequence
   WHERE Name=p_SequenceName  AND IsActive='Y'  AND IsTableID='N'  AND IsAutoSequence='Y'  AND AD_Client_ID=p_AD_Client_ID  FOR UPDATE OF CurrentNext, CurrentNextSys;
-  IF(v_NextNoSys&lt;&gt;-1 AND p_AD_Client_ID&lt;1000000) THEN -- System No
+  IF(v_NextNoSys<>-1 AND p_AD_Client_ID<1000000) THEN -- System No
     IF p_Update_Next='Y' THEN
       UPDATE AD_Sequence
         SET CurrentNextSys=CurrentNextSys + IncrementNo, Updated=now()
@@ -59,6 +59,7 @@
   RAISE_APPLICATION_ERROR(-20000, '@DocumentSequenceNotFound@' || p_SequenceName) ;
 END AD_Sequence_Doc
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_SEQUENCE_DOCTYPE.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_SEQUENCE_DOCTYPE.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -5,7 +5,7 @@
       <parameter name="p_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_Update_Next" type="CHAR" mode="in"/>
       <parameter name="p_DocumentNo" type="VARCHAR" mode="out"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   * Version 2.5.0 ("License"); You may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
@@ -14,7 +14,7 @@
   * "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  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -28,7 +28,7 @@
   * Title: Get the next DocumentNo of Document Type
   * Description:
   *  store in parameter p_DocumentNo
-  *  If ID &lt; 1000000, use System Doc Sequence
+  *  If ID < 1000000, use System Doc Sequence
   *  If no Document Sequence is defined, return null !
   *   Use AD_Sequence_Doc('DocumentNo_myTable',.. to get it directly
   ************************************************************************/
@@ -60,7 +60,7 @@
 FROM C_DocType d, AD_Sequence s
 WHERE d.C_DocType_ID=p_DocType_ID -- parameter
   AND d.DocNoSequence_ID=s.AD_Sequence_ID  AND s.IsActive='Y'  AND s.IsTableID='N'  AND s.IsAutoSequence='Y'  FOR UPDATE OF CurrentNext, CurrentNextSys;
-IF(v_NextNoSys&lt;&gt;-1 AND p_ID&lt;1000000) THEN -- System No
+IF(v_NextNoSys<>-1 AND p_ID<1000000) THEN -- System No
   IF p_Update_Next='Y' THEN
     UPDATE AD_Sequence
       SET CurrentNextSys=CurrentNextSys + IncrementNo
@@ -81,6 +81,7 @@
   RAISE_APPLICATION_ERROR(-20000, '@DocumentTypeSequenceNotFound@') ;
 END AD_Sequence_DocType
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_SEQUENCE_NEXT.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_SEQUENCE_NEXT.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -4,7 +4,7 @@
       <parameter name="p_TableName" type="VARCHAR" mode="in"/>
       <parameter name="p_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_NextNo" type="NUMERIC" mode="out"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   * Version 2.5.0 ("License"); You may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
@@ -13,7 +13,7 @@
   * "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  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -27,7 +27,7 @@
   * Title: Get the next sequence number of TableName
   * Description:
   *  store in parameter p_NextNo
-  *  if ID &lt; 1000000, use System Doc Sequence
+  *  if ID < 1000000, use System Doc Sequence
   ************************************************************************/
   v_NextNoSys NUMBER;
   v_ResultStr VARCHAR(255) ;
@@ -39,7 +39,7 @@
   WHERE Name=p_TableName  AND IsActive='Y'  AND IsTableID='Y'  AND IsAutoSequence='Y'  FOR UPDATE OF CurrentNext, CurrentNextSys;
   --DBMS_OUTPUT.PUT_LINE('CurrentNext: ' || p_NextNo || ' - CurrentNextSys: ' || v_NextNoSys) ;
   v_ResultStr:='Write';
-  IF(v_NextNoSys&lt;&gt;-1 AND p_ID&lt;1000000) THEN -- System No
+  IF(v_NextNoSys<>-1 AND p_ID<1000000) THEN -- System No
     UPDATE AD_Sequence
       SET CurrentNextSys=CurrentNextSys + IncrementNo, Updated=now()
     WHERE Name=p_TableName;
@@ -56,6 +56,7 @@
   --   || v_ResultStr || ': ' || p_TableName);
 END AD_Sequence_Next
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_SEQUENCE_NEXTNO.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_SEQUENCE_NEXTNO.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,14 +2,14 @@
   <database name="FUNCTION AD_SEQUENCE_NEXTNO">
     <function name="AD_SEQUENCE_NEXTNO" type="NUMERIC">
       <parameter name="p_TableName" type="VARCHAR" mode="in"/>
-      <body>/******************************************************************************
+      <body><![CDATA[/******************************************************************************
 * The contents of this file are subject to the   Compiere License  Version 1.1
 * ("License"); You may not use this file except in compliance with the License
 * You may obtain a copy of the License at http://www.compiere.org/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                  Compiere  ERP &amp;  Business Solution
+* The Original Code is                  Compiere  ERP &  Business Solution
 * The Initial Developer of the Original Code is Jorg Janke  and ComPiere, Inc.
 * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
 * created by ComPiere are Copyright (C) ComPiere, Inc.;   All Rights Reserved.
@@ -33,6 +33,7 @@
 WHEN NO_DATA_FOUND THEN
   RAISE_APPLICATION_ERROR(-20516, 'Table Sequence not found') ;
 END AD_Sequence_NextNo 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_SHORTNAME.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_SHORTNAME.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION AD_SHORTNAME">
     <function name="AD_SHORTNAME" type="NVARCHAR">
       <parameter name="p_Name" type="NVARCHAR" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -25,7 +25,7 @@
   v_pos NUMBER:=1;
 BEGIN
   v_RetValue:=SUBSTR(p_Name, 1, 1) ;
-  WHILE(INSTR(REPLACE(p_Name, '.', ' '), ' ', v_pos+1) &gt; 0)
+  WHILE(INSTR(REPLACE(p_Name, '.', ' '), ' ', v_pos+1) > 0)
   LOOP
     v_pos:=INSTR(REPLACE(p_Name, '.', ' '), ' ', v_pos+1) ;
     v_RetValue:=v_RetValue || SUBSTR(p_Name, v_pos+1, 1) ;
@@ -35,6 +35,7 @@
 WHEN OTHERS THEN
   RETURN TO_CHAR(v_pos) ;
 END AD_ShortName
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_SYNCHRONIZE.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_SYNCHRONIZE.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION AD_SYNCHRONIZE">
     <function name="AD_SYNCHRONIZE" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   * Version 2.5.0 ("License"); You may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
@@ -11,7 +11,7 @@
   * "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  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -210,9 +210,9 @@
     WHERE EXISTS
       (SELECT *
       FROM AD_ELEMENT e
-      WHERE AD_COLUMN.AD_Element_ID=e.AD_Element_ID  AND(--AD_Column.ColumnName &lt;&gt; e.ColumnName OR
-        AD_COLUMN.NAME&lt;&gt;e.NAME  OR COALESCE(TO_CHAR(AD_COLUMN.Description), ' ')&lt;&gt;COALESCE(TO_CHAR(e.Description), ' ')
-        OR COALESCE(TO_CHAR(AD_COLUMN.Help), ' ')&lt;&gt;COALESCE(TO_CHAR(e.Help), ' '))
+      WHERE AD_COLUMN.AD_Element_ID=e.AD_Element_ID  AND(--AD_Column.ColumnName <> e.ColumnName OR
+        AD_COLUMN.NAME<>e.NAME  OR COALESCE(TO_CHAR(AD_COLUMN.Description), ' ')<>COALESCE(TO_CHAR(e.Description), ' ')
+        OR COALESCE(TO_CHAR(AD_COLUMN.Help), ' ')<>COALESCE(TO_CHAR(e.Help), ' '))
       )
       ;
     v_rowcount:=SQL%ROWCOUNT;
@@ -240,8 +240,8 @@
       (SELECT *
       FROM AD_ELEMENT e, AD_COLUMN c
       WHERE AD_FIELD.AD_Column_ID=c.AD_Column_ID  AND c.AD_Element_ID=e.AD_Element_ID
-      AND c.AD_Process_ID IS NULL  AND(AD_FIELD.NAME&lt;&gt;e.NAME OR COALESCE(TO_CHAR(AD_FIELD.Description), ' ')&lt;&gt;COALESCE(TO_CHAR(e.Description), ' ')
-      OR COALESCE(TO_CHAR(AD_FIELD.Help), ' ')&lt;&gt;COALESCE(TO_CHAR(e.Help), ' '))
+      AND c.AD_Process_ID IS NULL  AND(AD_FIELD.NAME<>e.NAME OR COALESCE(TO_CHAR(AD_FIELD.Description), ' ')<>COALESCE(TO_CHAR(e.Description), ' ')
+      OR COALESCE(TO_CHAR(AD_FIELD.Help), ' ')<>COALESCE(TO_CHAR(e.Help), ' '))
       )AND NOT EXISTS
       (SELECT 1
       FROM AD_TAB t, AD_WINDOW w
@@ -283,8 +283,8 @@
       WHERE AD_FIELD_TRL.AD_Field_ID=f.AD_Field_ID  AND f.AD_Column_ID=c.AD_Column_ID
       AND c.AD_Element_ID=e.AD_Element_ID AND c.AD_Process_ID IS NULL
       AND AD_FIELD_TRL.AD_LANGUAGE=e.AD_LANGUAGE  AND f.IsCentrallyMaintained='Y' AND f.IsActive='Y'
-      AND(AD_FIELD_TRL.NAME&lt;&gt;e.NAME OR COALESCE(TO_CHAR(AD_FIELD_TRL.Description), ' ')&lt;&gt;COALESCE(TO_CHAR(e.Description), ' ')
-      OR COALESCE(TO_CHAR(AD_FIELD_TRL.Help), ' ')&lt;&gt;COALESCE(TO_CHAR(e.Help), ' '))
+      AND(AD_FIELD_TRL.NAME<>e.NAME OR COALESCE(TO_CHAR(AD_FIELD_TRL.Description), ' ')<>COALESCE(TO_CHAR(e.Description), ' ')
+      OR COALESCE(TO_CHAR(AD_FIELD_TRL.Help), ' ')<>COALESCE(TO_CHAR(e.Help), ' '))
       ) AND NOT EXISTS
       (SELECT 1
       FROM AD_FIELD f, AD_TAB t, AD_WINDOW w
@@ -317,8 +317,8 @@
       (SELECT *
       FROM AD_ELEMENT e, AD_COLUMN c
       WHERE AD_FIELD.AD_Column_ID=c.AD_Column_ID  AND c.AD_Element_ID=e.AD_Element_ID
-      AND c.AD_Process_ID IS NULL  AND(AD_FIELD.NAME&lt;&gt;e.PO_Name OR COALESCE(TO_CHAR(AD_FIELD.Description), ' ')&lt;&gt;COALESCE(TO_CHAR(e.PO_Description), ' ')
-      OR COALESCE(TO_CHAR(AD_FIELD.Help), ' ')&lt;&gt;COALESCE(TO_CHAR(e.PO_Help), ' ')) AND e.PO_Name IS NOT NULL
+      AND c.AD_Process_ID IS NULL  AND(AD_FIELD.NAME<>e.PO_Name OR COALESCE(TO_CHAR(AD_FIELD.Description), ' ')<>COALESCE(TO_CHAR(e.PO_Description), ' ')
+      OR COALESCE(TO_CHAR(AD_FIELD.Help), ' ')<>COALESCE(TO_CHAR(e.PO_Help), ' ')) AND e.PO_Name IS NOT NULL
       )
       AND EXISTS
       (SELECT *
@@ -362,8 +362,8 @@
       WHERE AD_FIELD_TRL.AD_Field_ID=f.AD_Field_ID  AND f.AD_Column_ID=c.AD_Column_ID
       AND c.AD_Element_ID=e.AD_Element_ID AND c.AD_Process_ID IS NULL
       AND AD_FIELD_TRL.AD_LANGUAGE=e.AD_LANGUAGE  AND f.IsCentrallyMaintained='Y' AND f.IsActive='Y'
-      AND(AD_FIELD_TRL.NAME&lt;&gt;e.PO_Name OR COALESCE(TO_CHAR(AD_FIELD_TRL.Description), ' ')&lt;&gt;COALESCE(TO_CHAR(e.PO_Description), ' ')
-      OR COALESCE(TO_CHAR(AD_FIELD_TRL.Help), ' ')&lt;&gt;COALESCE(TO_CHAR(e.PO_Help), ' ')) AND e.PO_Name IS NOT NULL
+      AND(AD_FIELD_TRL.NAME<>e.PO_Name OR COALESCE(TO_CHAR(AD_FIELD_TRL.Description), ' ')<>COALESCE(TO_CHAR(e.PO_Description), ' ')
+      OR COALESCE(TO_CHAR(AD_FIELD_TRL.Help), ' ')<>COALESCE(TO_CHAR(e.PO_Help), ' ')) AND e.PO_Name IS NOT NULL
       )
       AND EXISTS
       (SELECT *
@@ -397,8 +397,8 @@
       (SELECT *
       FROM AD_PROCESS p, AD_COLUMN c
       WHERE c.AD_Process_ID=p.AD_Process_ID AND AD_FIELD.AD_Column_ID=c.AD_Column_ID
-      AND(AD_FIELD.NAME&lt;&gt;p.NAME OR COALESCE(TO_CHAR(AD_FIELD.Description), ' ')&lt;&gt;COALESCE(TO_CHAR(p.Description), ' ')
-      OR COALESCE(TO_CHAR(AD_FIELD.Help), ' ')&lt;&gt;COALESCE(TO_CHAR(p.Help), ' '))
+      AND(AD_FIELD.NAME<>p.NAME OR COALESCE(TO_CHAR(AD_FIELD.Description), ' ')<>COALESCE(TO_CHAR(p.Description), ' ')
+      OR COALESCE(TO_CHAR(AD_FIELD.Help), ' ')<>COALESCE(TO_CHAR(p.Help), ' '))
       )
       ;
     v_rowcount:=SQL%ROWCOUNT;
@@ -435,8 +435,8 @@
       (SELECT *
       FROM AD_PROCESS_TRL p, AD_COLUMN c, AD_FIELD f
       WHERE c.AD_Process_ID=p.AD_Process_ID AND f.AD_Column_ID=c.AD_Column_ID  AND f.AD_Field_ID=AD_FIELD_TRL.AD_Field_ID
-      AND p.AD_LANGUAGE=AD_FIELD_TRL.AD_LANGUAGE  AND f.IsCentrallyMaintained='Y' AND f.IsActive='Y'  AND(AD_FIELD_TRL.NAME&lt;&gt;p.NAME
-      OR COALESCE(TO_CHAR(AD_FIELD_TRL.Description), ' ')&lt;&gt;COALESCE(TO_CHAR(p.Description), ' ') OR COALESCE(TO_CHAR(AD_FIELD_TRL.Help), ' ')&lt;&gt;COALESCE(TO_CHAR(p.Help), ' '))
+      AND p.AD_LANGUAGE=AD_FIELD_TRL.AD_LANGUAGE  AND f.IsCentrallyMaintained='Y' AND f.IsActive='Y'  AND(AD_FIELD_TRL.NAME<>p.NAME
+      OR COALESCE(TO_CHAR(AD_FIELD_TRL.Description), ' ')<>COALESCE(TO_CHAR(p.Description), ' ') OR COALESCE(TO_CHAR(AD_FIELD_TRL.Help), ' ')<>COALESCE(TO_CHAR(p.Help), ' '))
       );
     v_rowcount:=SQL%ROWCOUNT;
     DBMS_OUTPUT.PUT_LINE('  rows updated: ' || v_rowcount) ;
@@ -447,11 +447,11 @@
     WHERE AD_Process_Para.IsCentrallyMaintained='Y' AND AD_Process_Para.IsActive='Y'
     AND EXISTS (SELECT * FROM AD_Element e
     WHERE e.AD_Element_ID=AD_Process_Para.AD_Element_ID
-    AND e.ColumnName&lt;&gt;AD_Process_Para.ColumnName);*/
+    AND e.ColumnName<>AD_Process_Para.ColumnName);*/
     -- Paramenter Fields
     UPDATE AD_PROCESS_PARA
       SET IsCentrallyMaintained='N'
-    WHERE IsCentrallyMaintained&lt;&gt;'N'  AND NOT EXISTS
+    WHERE IsCentrallyMaintained<>'N'  AND NOT EXISTS
       (SELECT *
       FROM AD_ELEMENT e
       WHERE AD_PROCESS_PARA.AD_Element_ID=e.AD_Element_ID
@@ -479,9 +479,9 @@
     WHERE AD_PROCESS_PARA.IsCentrallyMaintained='Y' AND AD_PROCESS_PARA.IsActive='Y'  AND EXISTS
       (SELECT *
       FROM AD_ELEMENT e
-      WHERE e.AD_Element_ID=AD_PROCESS_PARA.AD_Element_ID  AND(AD_PROCESS_PARA.NAME&lt;&gt;e.NAME
-      OR COALESCE(TO_CHAR(AD_PROCESS_PARA.Description), ' ')&lt;&gt;COALESCE(TO_CHAR(e.Description), ' ')
-      OR COALESCE(TO_CHAR(AD_PROCESS_PARA.Help), ' ')&lt;&gt;COALESCE(TO_CHAR(e.Help), ' '))
+      WHERE e.AD_Element_ID=AD_PROCESS_PARA.AD_Element_ID  AND(AD_PROCESS_PARA.NAME<>e.NAME
+      OR COALESCE(TO_CHAR(AD_PROCESS_PARA.Description), ' ')<>COALESCE(TO_CHAR(e.Description), ' ')
+      OR COALESCE(TO_CHAR(AD_PROCESS_PARA.Help), ' ')<>COALESCE(TO_CHAR(e.Help), ' '))
       )
       ;
     v_rowcount:=SQL%ROWCOUNT;
@@ -519,8 +519,8 @@
       FROM AD_ELEMENT_TRL et, AD_PROCESS_PARA f
       WHERE et.AD_LANGUAGE=AD_PROCESS_PARA_TRL.AD_LANGUAGE AND f.AD_Element_ID=et.AD_Element_ID
       AND f.AD_Process_Para_ID=AD_PROCESS_PARA_TRL.AD_Process_Para_ID  AND f.IsCentrallyMaintained='Y'
-      AND f.IsActive='Y'  AND(AD_PROCESS_PARA_TRL.NAME&lt;&gt;et.NAME OR COALESCE(TO_CHAR(AD_PROCESS_PARA_TRL.Description), ' ')&lt;&gt;COALESCE(TO_CHAR(et.Description), ' ')
-      OR COALESCE(TO_CHAR(AD_PROCESS_PARA_TRL.Help), ' ')&lt;&gt;COALESCE(TO_CHAR(et.Help), ' '))
+      AND f.IsActive='Y'  AND(AD_PROCESS_PARA_TRL.NAME<>et.NAME OR COALESCE(TO_CHAR(AD_PROCESS_PARA_TRL.Description), ' ')<>COALESCE(TO_CHAR(et.Description), ' ')
+      OR COALESCE(TO_CHAR(AD_PROCESS_PARA_TRL.Help), ' ')<>COALESCE(TO_CHAR(et.Help), ' '))
       );
     v_rowcount:=SQL%ROWCOUNT;
     DBMS_OUTPUT.PUT_LINE('  rows updated: ' || v_rowcount) ;
@@ -539,8 +539,8 @@
     WHERE AD_WF_NODE.IsCentrallyMaintained='Y'  AND EXISTS
       (SELECT *
       FROM AD_WINDOW w
-      WHERE w.AD_Window_ID=AD_WF_NODE.AD_Window_ID  AND(w.NAME&lt;&gt;AD_WF_NODE.NAME OR COALESCE(TO_CHAR(w.Description), ' ')&lt;&gt;COALESCE(TO_CHAR(AD_WF_NODE.Description), ' ')
-      OR COALESCE(TO_CHAR(w.Help), ' ')&lt;&gt;COALESCE(TO_CHAR(AD_WF_NODE.Help), ' '))
+      WHERE w.AD_Window_ID=AD_WF_NODE.AD_Window_ID  AND(w.NAME<>AD_WF_NODE.NAME OR COALESCE(TO_CHAR(w.Description), ' ')<>COALESCE(TO_CHAR(AD_WF_NODE.Description), ' ')
+      OR COALESCE(TO_CHAR(w.Help), ' ')<>COALESCE(TO_CHAR(AD_WF_NODE.Help), ' '))
       )
       ;
     v_rowcount:=SQL%ROWCOUNT;
@@ -571,8 +571,8 @@
       FROM AD_WINDOW_TRL t, AD_WF_NODE n
       WHERE AD_WF_NODE_TRL.AD_WF_Node_ID=n.AD_WF_Node_ID AND n.AD_Window_ID=t.AD_Window_ID
       AND AD_WF_NODE_TRL.AD_LANGUAGE=t.AD_LANGUAGE AND n.IsCentrallyMaintained='Y' AND n.IsActive='Y'
-      AND(AD_WF_NODE_TRL.NAME&lt;&gt;t.NAME OR COALESCE(TO_CHAR(AD_WF_NODE_TRL.Description), ' ')&lt;&gt;COALESCE(TO_CHAR(t.Description), ' ')
-      OR COALESCE(TO_CHAR(AD_WF_NODE_TRL.Help), ' ')&lt;&gt;COALESCE(TO_CHAR(t.Help), ' '))
+      AND(AD_WF_NODE_TRL.NAME<>t.NAME OR COALESCE(TO_CHAR(AD_WF_NODE_TRL.Description), ' ')<>COALESCE(TO_CHAR(t.Description), ' ')
+      OR COALESCE(TO_CHAR(AD_WF_NODE_TRL.Help), ' ')<>COALESCE(TO_CHAR(t.Help), ' '))
       )
       ;
     v_rowcount:=SQL%ROWCOUNT;
@@ -592,8 +592,8 @@
     WHERE AD_WF_NODE.IsCentrallyMaintained='Y'  AND EXISTS
       (SELECT *
       FROM AD_FORM f
-      WHERE f.AD_Form_ID=AD_WF_NODE.AD_Form_ID  AND(f.NAME&lt;&gt;AD_WF_NODE.NAME OR COALESCE(TO_CHAR(f.Description), ' ')&lt;&gt;COALESCE(TO_CHAR(AD_WF_NODE.Description), ' ')
-      OR COALESCE(TO_CHAR(f.Help), ' ')&lt;&gt;COALESCE(TO_CHAR(AD_WF_NODE.Help), ' '))
+      WHERE f.AD_Form_ID=AD_WF_NODE.AD_Form_ID  AND(f.NAME<>AD_WF_NODE.NAME OR COALESCE(TO_CHAR(f.Description), ' ')<>COALESCE(TO_CHAR(AD_WF_NODE.Description), ' ')
+      OR COALESCE(TO_CHAR(f.Help), ' ')<>COALESCE(TO_CHAR(AD_WF_NODE.Help), ' '))
       )
       ;
     v_rowcount:=SQL%ROWCOUNT;
@@ -624,8 +624,8 @@
       FROM AD_FORM_TRL t, AD_WF_NODE n
       WHERE AD_WF_NODE_TRL.AD_WF_Node_ID=n.AD_WF_Node_ID AND n.AD_Form_ID=t.AD_Form_ID
       AND AD_WF_NODE_TRL.AD_LANGUAGE=t.AD_LANGUAGE AND n.IsCentrallyMaintained='Y' AND n.IsActive='Y'
-      AND(AD_WF_NODE_TRL.NAME&lt;&gt;t.NAME OR COALESCE(TO_CHAR(AD_WF_NODE_TRL.Description), ' ')&lt;&gt;COALESCE(TO_CHAR(t.Description), ' ')
-      OR COALESCE(TO_CHAR(AD_WF_NODE_TRL.Help), ' ')&lt;&gt;COALESCE(TO_CHAR(t.Help), ' '))
+      AND(AD_WF_NODE_TRL.NAME<>t.NAME OR COALESCE(TO_CHAR(AD_WF_NODE_TRL.Description), ' ')<>COALESCE(TO_CHAR(t.Description), ' ')
+      OR COALESCE(TO_CHAR(AD_WF_NODE_TRL.Help), ' ')<>COALESCE(TO_CHAR(t.Help), ' '))
       )
       ;
     v_rowcount:=SQL%ROWCOUNT;
@@ -641,7 +641,7 @@
       (SELECT *
       FROM AD_ELEMENT e, AD_COLUMN c
       WHERE e.AD_Element_ID=c.AD_Element_ID  AND c.AD_Column_ID=AD_PRINTFORMATITEM.AD_Column_ID
-      AND e.NAME&lt;&gt;AD_PRINTFORMATITEM.NAME
+      AND e.NAME<>AD_PRINTFORMATITEM.NAME
       )
       AND EXISTS
       (SELECT *
@@ -662,7 +662,7 @@
       (SELECT *
       FROM AD_ELEMENT e, AD_COLUMN c, AD_PRINTFORMAT pf
       WHERE e.AD_Element_ID=c.AD_Element_ID  AND c.AD_Column_ID=AD_PRINTFORMATITEM.AD_Column_ID
-      AND LENGTH(AD_PRINTFORMATITEM.PrintName)&gt;0  AND e.PrintName&lt;&gt;AD_PRINTFORMATITEM.PrintName
+      AND LENGTH(AD_PRINTFORMATITEM.PrintName)>0  AND e.PrintName<>AD_PRINTFORMATITEM.PrintName
       AND pf.AD_PrintFormat_ID=AD_PRINTFORMATITEM.AD_PrintFormat_ID  AND pf.IsForm='N' AND IsTableBased='Y'
       )
       AND EXISTS
@@ -686,7 +686,7 @@
       FROM AD_ELEMENT_TRL e, AD_COLUMN c, AD_PRINTFORMATITEM pfi, AD_PRINTFORMAT pf
       WHERE e.AD_LANGUAGE=AD_PRINTFORMATITEM_TRL.AD_LANGUAGE  AND e.AD_Element_ID=c.AD_Element_ID
       AND c.AD_Column_ID=pfi.AD_Column_ID  AND pfi.AD_PrintFormatItem_ID=AD_PRINTFORMATITEM_TRL.AD_PrintFormatItem_ID
-      AND LENGTH(pfi.PrintName)&gt;0  AND(e.PrintName&lt;&gt;AD_PRINTFORMATITEM_TRL.PrintName OR AD_PRINTFORMATITEM_TRL.PrintName IS NULL)
+      AND LENGTH(pfi.PrintName)>0  AND(e.PrintName<>AD_PRINTFORMATITEM_TRL.PrintName OR AD_PRINTFORMATITEM_TRL.PrintName IS NULL)
       AND pf.AD_PrintFormat_ID=pfi.AD_PrintFormat_ID  AND pf.IsForm='N' AND IsTableBased='Y'
       )
       AND EXISTS
@@ -708,7 +708,7 @@
       (SELECT *
       FROM AD_PRINTFORMATITEM pfi, AD_PRINTFORMAT pf
       WHERE pfi.AD_PrintFormatItem_ID=AD_PRINTFORMATITEM_TRL.AD_PrintFormatItem_ID
-      AND LENGTH(pfi.PrintName)&gt;0  AND pfi.PrintName&lt;&gt;AD_PRINTFORMATITEM_TRL.PrintName
+      AND LENGTH(pfi.PrintName)>0  AND pfi.PrintName<>AD_PRINTFORMATITEM_TRL.PrintName
       AND pf.AD_PrintFormat_ID=pfi.AD_PrintFormat_ID  AND pf.IsForm='N' AND pf.IsTableBased='Y'
       )
       AND EXISTS
@@ -936,7 +936,7 @@
       ;
     v_rowcount:=SQL%ROWCOUNT;
     DBMS_OUTPUT.PUT_LINE('  trl rows updated: ' || v_rowcount) ;
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     IF(p_PInstance_ID IS NOT NULL) THEN
       --  Update AD_PInstance
       DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
@@ -955,6 +955,7 @@
   RETURN;
 END Ad_Synchronize
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_TABLE_IMPORT.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_TABLE_IMPORT.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -3,7 +3,7 @@
     <function name="AD_TABLE_IMPORT" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_AD_Table_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   * Version 2.5.0 ("License"); You may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
@@ -12,7 +12,7 @@
   * "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  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -115,7 +115,7 @@
       v_IsUpdateable:='Y';
       v_varchar2:=Cur_Column.DATA_DEFAULT;
       v_varchar2:=SUBSTR(v_varchar2, 1, 2000) ;
-      IF(INSTR(v_varchar2, '''')&lt;&gt;0) THEN
+      IF(INSTR(v_varchar2, '''')<>0) THEN
         v_varchar2:=SUBSTR(SUBSTR(v_varchar2, 2, 1999), 1, INSTR(SUBSTR(v_varchar2, 2, 1999), '''') -1) ;
       ELSE
         v_varchar2:=TRIM(REPLACE(REPLACE(v_varchar2, 'now()', '@#Date@'), CHR(10), '')) ;
@@ -199,7 +199,7 @@
         END IF;
       END IF;
       v_columnName:=InitCap(Cur_Column.Column_Name) ;
-      IF(INSTR(v_columnName, '_')&lt;&gt;0 AND INSTR(v_columnName, '_')&lt;5) THEN
+      IF(INSTR(v_columnName, '_')<>0 AND INSTR(v_columnName, '_')<5) THEN
         v_columnName:=UPPER(SUBSTR(v_columnName, 1, INSTR(v_columnName, '_'))) ||SUBSTR(v_columnName, INSTR(v_columnName, '_') +1, 40) ;
       END IF;
       IF(v_columnName LIKE '%_Id') THEN
@@ -243,7 +243,7 @@
     END LOOP; --  All new columns
     -- Summary info
     v_Message:='@Created@ = ' || v_count;
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     IF(p_PInstance_ID IS NOT NULL) THEN
       --  Update AD_PInstance
       DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
@@ -265,6 +265,7 @@
 --  RETURN;
 END AD_Table_Import
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_TABLE_IMPORT0.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_TABLE_IMPORT0.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION AD_TABLE_IMPORT0">
     <function name="AD_TABLE_IMPORT0" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   * Version 2.5.0 ("License"); You may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
@@ -11,7 +11,7 @@
   * "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  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -29,6 +29,7 @@
   AD_Table_Import(p_PInstance_ID, NULL) ;
 END AD_Table_Import0
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_TAB_COPY.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_TAB_COPY.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION AD_TAB_COPY">
     <function name="AD_TAB_COPY" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   * Version 2.5.0 ("License"); You may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
@@ -11,7 +11,7 @@
   * "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  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -116,7 +116,7 @@
       v_NoOfFields:=v_NoOfFields + 1;
     END LOOP;
     v_Message:='@Copied@=' || v_NoOfFields;
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
     AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'N', 1, v_Message) ;
@@ -130,6 +130,7 @@
   RETURN;
 END AD_Tab_Copy
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_TAB_IMPORT.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_TAB_IMPORT.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -3,7 +3,7 @@
     <function name="AD_TAB_IMPORT" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_AD_Tab_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   * Version 2.5.0 ("License"); You may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
@@ -12,7 +12,7 @@
   * "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  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -161,7 +161,7 @@
     END LOOP; --  for all columns
     -- Summary info
     v_Message:='@Created@ = ' || v_count;
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     IF(p_PInstance_ID IS NOT NULL) THEN
       --  Update AD_PInstance
       DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
@@ -188,6 +188,7 @@
 --  RETURN;
 END AD_Tab_Import
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_TAB_IMPORT0.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_TAB_IMPORT0.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION AD_TAB_IMPORT0">
     <function name="AD_TAB_IMPORT0" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
  * The contents of this file are subject to the Compiere License
  * Version 2.5.0 ("License"); You may not use this file except in
  * compliance with the License. You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * "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  Compiere  ERP &amp;  Business Solution
+ * The Original Code is  Compiere  ERP &  Business Solution
  * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
 Inc.
  * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -29,6 +29,7 @@
  AD_Tab_Import (p_PInstance_ID, NULL);
 END AD_Tab_Import0
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_TRANSLATE_ID.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_TRANSLATE_ID.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -6,7 +6,7 @@
       <parameter name="p_tableName" type="VARCHAR" mode="in"/>
       <parameter name="p_columnName" type="VARCHAR" mode="in"/>
       <parameter name="p_clientID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -37,6 +37,7 @@
   END IF;
   RETURN v_ID;
 END AD_Translate_ID 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_UPDATE_ACCESS.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_UPDATE_ACCESS.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
   <database name="FUNCTION AD_UPDATE_ACCESS">
     <function name="AD_UPDATE_ACCESS" type="NULL">
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -150,6 +150,7 @@
       (AD_ROLE.USERLEVEL = '  O' AND AD_WORKFLOW.ACCESSLEVEL IN ('3','1','7'))
     );
 END AD_UPDATE_ACCESS
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_UPDATE_PINSTANCE.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_UPDATE_PINSTANCE.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -6,7 +6,7 @@
       <parameter name="p_IsProcessing" type="CHAR" mode="in"/>
       <parameter name="p_Result" type="NUMERIC" mode="in"/>
       <parameter name="p_Message" type="VARCHAR" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -35,6 +35,7 @@
   COMMIT;
 END AD_UPDATE_PINSTANCE
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_UPDATE_SEQUENCE.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_UPDATE_SEQUENCE.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
   <database name="FUNCTION AD_UPDATE_SEQUENCE">
     <function name="AD_UPDATE_SEQUENCE" type="NULL">
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -54,11 +54,11 @@
       SET CURRENTNEXT=(SELECT AD_SEQUENCE.INCREMENTNO + 
                                    (CASE SIGN(COALESCE((SELECT MAX(t.AD_Sequence_ID) 
                                                           FROM AD_Sequence t 
-                                                          WHERE t.AD_Sequence_ID&lt;TO_NUMBER(v_StartWith)),0)-TO_NUMBER(v_StartWithSys))
+                                                          WHERE t.AD_Sequence_ID<TO_NUMBER(v_StartWith)),0)-TO_NUMBER(v_StartWithSys))
                                     WHEN  -1  THEN TO_NUMBER(v_StartWithSys)-AD_SEQUENCE.INCREMENTNO 
                                     ELSE (SELECT MAX(t.AD_Sequence_ID) 
                                             FROM AD_Sequence t 
-                                           WHERE t.AD_Sequence_ID&lt;TO_NUMBER(v_StartWith)) 
+                                           WHERE t.AD_Sequence_ID<TO_NUMBER(v_StartWith)) 
                                      END) AS SEQUENCE 
                              FROM AD_SEQUENCE 
                             WHERE UPPER(NAME) = 'AD_SEQUENCE')
@@ -68,7 +68,7 @@
         SET CURRENTNEXTSYS=(SELECT AD_SEQUENCE.INCREMENTNO + 
                                   COALESCE((SELECT MAX(t.AD_SEQUENCE_ID) 
                                               FROM AD_SEQUENCE t 
-                                             WHERE t.AD_SEQUENCE_ID&lt;TO_NUMBER(v_StartWith)),(TO_NUMBER(v_StartWithSys)-AD_SEQUENCE.INCREMENTNO))
+                                             WHERE t.AD_SEQUENCE_ID<TO_NUMBER(v_StartWith)),(TO_NUMBER(v_StartWithSys)-AD_SEQUENCE.INCREMENTNO))
                               FROM AD_SEQUENCE 
                              WHERE UPPER(NAME) = 'AD_SEQUENCE')
        WHERE UPPER(NAME) = 'AD_SEQUENCE'; 
@@ -97,17 +97,17 @@
         (SELECT AD_SEQUENCE.INCREMENTNO + 
                 COALESCE((SELECT MAX(t.Fact_Acct_Group_id) 
                             FROM FACT_ACCT t 
-                           WHERE t.Fact_Acct_Group_id&lt; TO_NUMBER(v_StartWith)),(TO_NUMBER(v_StartWithSys)-AD_SEQUENCE.INCREMENTNO))
+                           WHERE t.Fact_Acct_Group_id< TO_NUMBER(v_StartWith)),(TO_NUMBER(v_StartWithSys)-AD_SEQUENCE.INCREMENTNO))
             FROM AD_SEQUENCE 
            WHERE UPPER(NAME) = 'AD_SEQUENCE'), 
         (SELECT AD_SEQUENCE.INCREMENTNO + 
                (CASE SIGN(COALESCE((SELECT MAX(t.Fact_Acct_Group_id) 
                                       FROM fact_acct t 
-                                      WHERE t.Fact_Acct_Group_id&lt;TO_NUMBER(v_StartWith)),0)-TO_NUMBER(v_StartWithSys))
+                                      WHERE t.Fact_Acct_Group_id<TO_NUMBER(v_StartWith)),0)-TO_NUMBER(v_StartWithSys))
                 WHEN  -1  THEN TO_NUMBER(v_StartWithSys)-AD_SEQUENCE.INCREMENTNO 
                 ELSE (SELECT MAX(t.Fact_Acct_Group_id) 
                         FROM fact_acct t
-                       WHERE t.Fact_Acct_Group_id&lt; TO_NUMBER(v_StartWith))
+                       WHERE t.Fact_Acct_Group_id< TO_NUMBER(v_StartWith))
                  END) AS SEQUENCE 
          FROM AD_SEQUENCE 
         WHERE UPPER(NAME) = 'AD_SEQUENCE'),
@@ -147,6 +147,7 @@
    END LOOP;
 END Ad_Update_Sequence
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_UPDATE_SEQUENCE_GENERATE.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_UPDATE_SEQUENCE_GENERATE.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
   <database name="FUNCTION AD_UPDATE_SEQUENCE_GENERATE">
     <function name="AD_UPDATE_SEQUENCE_GENERATE" type="NULL">
-      <body>/************************************************************************* 
+      <body><![CDATA[/************************************************************************* 
 * 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 
@@ -43,7 +43,7 @@
           ) 
           , 
            'UPDATE AD_SEQUENCE SET CURRENTNEXT=(SELECT AD_SEQUENCE.INCREMENTNO + ' ||  'COALESCE((SELECT MAX(t.' || Cur_Tables.NAME || '_ID) FROM ' || Cur_Tables.NAME || 
-           ' t WHERE t.' || Cur_Tables.NAME || '_ID&gt;=AD_SEQUENCE.STARTNO),' ||  'AD_SEQUENCE.STARTNO-AD_SEQUENCE.INCREMENTNO) AS SEQUENCE FROM AD_SEQUENCE WHERE UPPER(NAME) = '||''''||Cur_Tables.NAME||''''|| 
+           ' t WHERE t.' || Cur_Tables.NAME || '_ID>=AD_SEQUENCE.STARTNO),' ||  'AD_SEQUENCE.STARTNO-AD_SEQUENCE.INCREMENTNO) AS SEQUENCE FROM AD_SEQUENCE WHERE UPPER(NAME) = '||''''||Cur_Tables.NAME||''''|| 
            ') WHERE UPPER(NAME) = '||''''||Cur_Tables.NAME||'''' 
         ) 
         ; 
@@ -57,8 +57,8 @@
             , 
              'UPDATE AD_SEQUENCE SET CURRENTNEXTSYS=('|| 
        ' SELECT AD_SEQUENCE.INCREMENTNO + ( CASE SIGN(COALESCE((SELECT MAX(t.' || Cur_Tables.NAME ||'_ID) FROM '||Cur_Tables.NAME||' t ' || 
-             ' WHERE t.' || Cur_Tables.NAME || '_ID&lt;' || v_StartWith ||'),0)-' || v_StartWithSys || ') WHEN  -1  THEN '||v_StartWithSys || '-AD_SEQUENCE.INCREMENTNO ELSE ' || '(SELECT MAX(t.' || Cur_Tables.NAME || 
-             '_ID) FROM ' ||Cur_Tables.NAME||  ' t WHERE t.' ||Cur_Tables.NAME ||'_ID&lt;' || v_StartWith || ') END) AS SEQUENCE '||  ' FROM AD_SEQUENCE '||  ' WHERE UPPER(NAME) = ' || '''' || Cur_Tables.NAME || ''''||') '|| 
+             ' WHERE t.' || Cur_Tables.NAME || '_ID<' || v_StartWith ||'),0)-' || v_StartWithSys || ') WHEN  -1  THEN '||v_StartWithSys || '-AD_SEQUENCE.INCREMENTNO ELSE ' || '(SELECT MAX(t.' || Cur_Tables.NAME || 
+             '_ID) FROM ' ||Cur_Tables.NAME||  ' t WHERE t.' ||Cur_Tables.NAME ||'_ID<' || v_StartWith || ') END) AS SEQUENCE '||  ' FROM AD_SEQUENCE '||  ' WHERE UPPER(NAME) = ' || '''' || Cur_Tables.NAME || ''''||') '|| 
              ' WHERE UPPER(NAME) = ' ||''''|| Cur_Tables.NAME || '''' 
           ) 
           ; 
@@ -71,7 +71,7 @@
             ) 
             , 
              'UPDATE AD_SEQUENCE SET CURRENTNEXTSYS=(' ||  ' SELECT AD_SEQUENCE.INCREMENTNO + COALESCE((SELECT MAX(t.' || Cur_Tables.NAME || 
-             '_ID) FROM ' || Cur_Tables.NAME ||' t WHERE t.' || Cur_Tables.NAME ||'_ID&lt;' || v_StartWith ||'),(' || v_StartWithSys || '-AD_SEQUENCE.INCREMENTNO))' || 
+             '_ID) FROM ' || Cur_Tables.NAME ||' t WHERE t.' || Cur_Tables.NAME ||'_ID<' || v_StartWith ||'),(' || v_StartWithSys || '-AD_SEQUENCE.INCREMENTNO))' || 
              ' FROM AD_SEQUENCE WHERE UPPER(NAME) = ' || '''' || Cur_Tables.NAME || ''''||')' ||  ' WHERE UPPER(NAME) = ' ||''''|| Cur_Tables.NAME || '''' 
           ) 
           ; 
@@ -79,6 +79,7 @@
     END LOOP; 
 END Ad_Update_Sequence_Generate
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_UPDATE_TABLE_IDENTIFIER.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_UPDATE_TABLE_IDENTIFIER.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION AD_UPDATE_TABLE_IDENTIFIER">
     <function name="AD_UPDATE_TABLE_IDENTIFIER" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -68,7 +68,7 @@
       v_count:=v_count + 1;
     END LOOP;
     v_Message:='@Updated@: ' || v_count;
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     DBMS_OUTPUT.PUT_LINE('AD_Update_Table_Identifier - Finished ' || v_Message) ;
     --  Update AD_PInstance
     IF(p_PInstance_ID IS NOT NULL) THEN
@@ -87,6 +87,7 @@
   RETURN;
 END Ad_Update_Table_Identifier
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AD_WINDOW_COPY.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AD_WINDOW_COPY.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION AD_WINDOW_COPY">
     <function name="AD_WINDOW_COPY" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   * Version 2.5.0 ("License"); You may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
@@ -11,7 +11,7 @@
   * "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  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -180,7 +180,7 @@
       v_NoOfTabs:=v_NoOfTabs + 1;
     END LOOP; -- Tab
     v_Message:='@Copied@=' || v_NoOfTabs || '/' || v_NoOfFields;
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
     AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'N', 1, v_Message) ;
@@ -194,6 +194,7 @@
   RETURN;
 END AD_Window_Copy
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AT_TEST_COPY.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AT_TEST_COPY.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION AT_TEST_COPY">
     <function name="AT_TEST_COPY" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -88,7 +88,7 @@
       v_NoOfLines:=v_NoOfLines + 1;
     END LOOP; -- Line
     v_Message:='@Copied@=' || v_NoOfLines || ' lines';
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
     AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'N', 1, v_Message) ;
@@ -102,6 +102,7 @@
   RETURN;
 END AT_Test_Copy
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/AT_TEST_DELETE.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/AT_TEST_DELETE.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION AT_TEST_DELETE">
     <function name="AT_TEST_DELETE" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -56,7 +56,7 @@
     --Delete lines
     DELETE FROM AT_LINE  WHERE AT_TEST_ID=v_Record_ID;
     v_Message:='@Deleted@=' || v_NoOfLines || ' lines';
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
     AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'N', 1, v_Message) ;
@@ -70,6 +70,7 @@
   RETURN;
 END AT_Test_Delete
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/A_AMORTIZATION_PROCESS.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/A_AMORTIZATION_PROCESS.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION A_AMORTIZATION_PROCESS">
     <function name="A_AMORTIZATION_PROCESS" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -97,7 +97,7 @@
         SET IsFullyDepreciated='Y'
       WHERE COALESCE(AmortizationValueAmt, -1)=COALESCE(DepreciatedValue, -2) ;
     END IF;
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     IF(p_PInstance_ID IS NOT NULL) THEN
       --  Update AD_PInstance
       DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
@@ -120,6 +120,7 @@
 --  RETURN;
 END a_Amortization_Process
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/A_ASSET_CREATE.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/A_ASSET_CREATE.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -3,7 +3,7 @@
     <function name="A_ASSET_CREATE" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_InOutLine_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   * Version 2.5.0 ("License"); You may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
@@ -12,7 +12,7 @@
   * "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  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -91,7 +91,7 @@
           ON(p.M_Product_Category_ID=pc.M_Product_Category_ID)
         INNER JOIN C_BPartner bp
           ON(s.C_BPartner_ID=bp.C_BPartner_ID)
-        WHERE pc.A_Asset_Group_ID IS NOT NULL  AND sl.M_InOutLine_ID=p_InOutLine_ID  AND sl.MovementQty&gt;0
+        WHERE pc.A_Asset_Group_ID IS NOT NULL  AND sl.M_InOutLine_ID=p_InOutLine_ID  AND sl.MovementQty>0
         )
       LOOP
         FOR i IN 1 .. Cur_Shipline.MovementQty
@@ -99,7 +99,7 @@
           v_ResultStr:='InsertingAsset';
           AD_Sequence_Next('A_Asset', Cur_Shipline.AD_Client_ID, v_A_Asset_ID) ;
           v_DocumentNo:='_' || Cur_Shipline.DocumentNo;
-          IF(Cur_Shipline.MovementQty&gt;1) THEN
+          IF(Cur_Shipline.MovementQty>1) THEN
             v_DocumentNo:=v_DocumentNo || '_' || i;
           END IF;
           v_Value:='_' || Cur_Shipline.Value || v_DocumentNo;
@@ -136,7 +136,7 @@
       END LOOP;
     END IF;
     DBMS_OUTPUT.PUT_LINE('Assets Created=' || v_count) ;
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     DBMS_OUTPUT.PUT_LINE('A_Asset_Create - Finished ' || v_Message) ;
     --  Update AD_PInstance
     IF(p_PInstance_ID IS NOT NULL) THEN
@@ -155,6 +155,7 @@
   RETURN;
 END A_Asset_Create
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/A_ASSET_GROUP_ACCT_COPY.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/A_ASSET_GROUP_ACCT_COPY.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION A_ASSET_GROUP_ACCT_COPY">
     <function name="A_ASSET_GROUP_ACCT_COPY" type="NULL">
       <parameter name="PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -101,7 +101,7 @@
       v_Created_Total:=v_Created_Total + v_Created;
     END LOOP;
     v_Message:='@Created@=' || v_Created_Total || ', @Updated@=' || v_Updated_Total;
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
     AD_UPDATE_PINSTANCE(PInstance_ID, NULL, 'N', 1, v_Message) ;
@@ -115,6 +115,7 @@
   RETURN;
 END A_Asset_Group_Acct_Copy
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/A_ASSET_POST.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/A_ASSET_POST.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -3,7 +3,7 @@
     <function name="A_ASSET_POST" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_Asset_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -98,7 +98,7 @@
       END LOOP; --  Get Parameter
       DBMS_OUTPUT.PUT_LINE('  v_Record_ID=' || v_Record_ID) ;
     ELSE
-      DBMS_OUTPUT.PUT_LINE('--&lt;&lt;A_Aset_Post&gt;&gt;') ;
+      DBMS_OUTPUT.PUT_LINE('--<<A_Aset_Post>>') ;
       v_Record_ID:=p_Asset_ID;
     END IF;
   BEGIN --BODY
@@ -120,7 +120,7 @@
     WHERE A_ASSET_ID=v_Record_ID;
     DBMS_OUTPUT.PUT_LINE('A_Asset_ID=' || v_Record_ID || ' - AMORTIZATIONTYPE=' || v_AMORTIZATIONTYPE) ;
     -- Restrictions...
-    IF COALESCE(v_AMORTIZATIONVALUEAMT, 0)&lt;=0 THEN
+    IF COALESCE(v_AMORTIZATIONVALUEAMT, 0)<=0 THEN
      RAISE_APPLICATION_ERROR(-20000, '@AmountNotDefined@') ;
     END IF;
     IF v_AMORTIZATIONCALCTYPE='PE' AND v_AMORTIZATIONPORCENTAGE IS NULL THEN
@@ -152,12 +152,12 @@
             FINISH_PROCESS:=true;
           end if;
           IF(NOT FINISH_PROCESS) THEN
-            if v_DepreciatedLines&gt;0 then
+            if v_DepreciatedLines>0 then
               SELECT to_number(to_char(max(startdate), 'YYYY')) - to_number(to_char(min(endDate), 'YYYY'))
               INTO v_Period
               FROM a_amortization am, a_amortizationline al
               WHERE al.a_amortization_id=am.a_amortization_id  AND al.a_asset_id=V_Record_ID;
-              if(v_DepreciatedLines&lt;&gt;v_Period) and(v_DepreciatedLines&lt;&gt;(v_Period+1)) then
+              if(v_DepreciatedLines<>v_Period) and(v_DepreciatedLines<>(v_Period+1)) then
                 RAISE_APPLICATION_ERROR(-20000, '@PeriodsDontMatch@') ;
               end if;
             end if;
@@ -178,7 +178,7 @@
             v_BEGINING_DATE:=v_AMORTIZATIONSTARTDATE;
             v_FIRST_DAY_DATE:=TO_DATE('01-01-' || TO_CHAR(v_AMORTIZATIONSTARTDATE, 'YYYY')) ;
             v_LAST_DAY_DATE:=TO_DATE('31-12-' || TO_CHAR(v_AMORTIZATIONSTARTDATE, 'YYYY')) ;
-            if v_Count&gt;1 then
+            if v_Count>1 then
               v_BEGINING_DATE:=TO_DATE('31-12-' || to_char(TO_number(to_char(v_BEGINING_DATE, 'yyyy')) +v_Count-1)) ;
               v_USELIFEYEARS:=v_USELIFEYEARS+1;
             end if;
@@ -188,7 +188,7 @@
             finish:=false;
             WHILE not finish
             LOOP
-              IF(v_COUNT=1 AND(v_BEGINING_DATE-v_FIRST_DAY_DATE&lt;&gt;0)) THEN
+              IF(v_COUNT=1 AND(v_BEGINING_DATE-v_FIRST_DAY_DATE<>0)) THEN
                 v_Percentage:=to_number((to_date('31-12'||to_char(v_AMORTIZATIONSTARTDATE, 'YYYY')) -v_AMORTIZATIONSTARTDATE) /to_number(to_date('31-12'||to_char(v_AMORTIZATIONSTARTDATE, 'YYYY')) -to_date('1-01'||to_char(v_AMORTIZATIONSTARTDATE, 'YYYY')))) * v_PercentageGeneral;
                 v_USELIFEYEARS:=v_USELIFEYEARS+1;
               ELSE
@@ -199,7 +199,7 @@
               SELECT COALESCE(MAX(A_AMORTIZATION_ID), -1)
               INTO v_NEW_AMORTIZATION
               FROM A_AMORTIZATION
-              WHERE STARTDATE&lt;=v_ENDING_DATE  AND ENDDATE&gt;=v_ENDING_DATE  AND AD_CLIENT_ID=v_AD_CLIENT_ID  AND PROCESSED='N';
+              WHERE STARTDATE<=v_ENDING_DATE  AND ENDDATE>=v_ENDING_DATE  AND AD_CLIENT_ID=v_AD_CLIENT_ID  AND PROCESSED='N';
               IF(v_NEW_AMORTIZATION=-1) THEN
                 Ad_Sequence_Next('A_Amortization', 1000000, v_NEW_AMORTIZATION) ;
                 INSERT
@@ -223,7 +223,7 @@
               INTO v_LINE
               FROM A_AMORTIZATIONLINE
               WHERE A_AMORTIZATION_ID=v_NEW_AMORTIZATION;
-              IF(((v_AMORTIZATIONVALUEAMT+v_DEPRECIATEDPREVIOUSAMT) *v_PERCENTAGE/100)&gt;(v_AMORTIZATIONVALUEAMT -v_TotalAmt)) THEN
+              IF(((v_AMORTIZATIONVALUEAMT+v_DEPRECIATEDPREVIOUSAMT) *v_PERCENTAGE/100)>(v_AMORTIZATIONVALUEAMT -v_TotalAmt)) THEN
                 SELECT SUM(AMORTIZATIONAMT), SUM(AMORTIZATION_PORCENTAGE)
                 INTO v_AMOUNT, v_PERCENTAGE
                 FROM A_AMORTIZATIONLINE
@@ -234,7 +234,7 @@
               ELSE
                 v_AMOUNT:=(v_AMORTIZATIONVALUEAMT+ v_DEPRECIATEDPREVIOUSAMT) *v_PERCENTAGE/100;
               END IF;
-              if v_percentage&gt;0 then
+              if v_percentage>0 then
                 Ad_Sequence_Next('A_Amortizationline', 1000000, v_AMORTIZATIONLINE) ;
                 INSERT
                 INTO A_AMORTIZATIONLINE
@@ -260,12 +260,12 @@
             end if;
           END IF; --FINISH_PROCESS
           IF(NOT FINISH_PROCESS) THEN
-            if v_DepreciatedLines&gt;0 then
+            if v_DepreciatedLines>0 then
               SELECT trunc(months_Between(max(startdate), min(endDate))) +1
               INTO v_Period
               FROM a_amortization am, a_amortizationline al
               WHERE al.a_amortization_id=am.a_amortization_id  AND al.a_asset_id=V_Record_ID;
-              if(v_DepreciatedLines&lt;&gt;v_Period) and(v_DepreciatedLines&lt;&gt;(v_Period+1)) then
+              if(v_DepreciatedLines<>v_Period) and(v_DepreciatedLines<>(v_Period+1)) then
                 RAISE_APPLICATION_ERROR(-20000, '@PeriodsDontMatch@') ;
               end if;
             end if;
@@ -287,7 +287,7 @@
             v_BEGINING_DATE:=v_AMORTIZATIONSTARTDATE;
             v_FIRST_DAY_DATE:=TO_DATE('01-'|| TO_CHAR(v_AMORTIZATIONSTARTDATE, 'MM') || '-' || TO_CHAR(v_AMORTIZATIONSTARTDATE, 'YYYY')) ;
             v_LAST_DAY_DATE:=TO_DATE('31-12-'|| TO_CHAR(v_AMORTIZATIONSTARTDATE, 'YYYY')) ;
-            if v_Count&gt;1 then
+            if v_Count>1 then
               v_BEGINING_DATE:=ADD_MONTHS(LAST_DAY(TO_DATE('01-' || TO_CHAR(v_BEGINING_DATE, 'MM') || '-' || TO_CHAR(v_BEGINING_DATE, 'yyyy'))), v_DepreciatedLines) ;
               v_USELIFEMonths:=v_USELIFEMonths+1;
             end if;
@@ -297,7 +297,7 @@
             finish:=false;
             while not finish
             loop
-              IF(v_COUNT=1 AND(v_BEGINING_DATE-v_FIRST_DAY_DATE&lt;&gt;0)) THEN
+              IF(v_COUNT=1 AND(v_BEGINING_DATE-v_FIRST_DAY_DATE<>0)) THEN
                 v_Percentage:=to_number((last_day(v_BEGINING_DATE) -v_BEGINING_DATE)) /(trunc(to_number((last_day(v_BEGINING_DATE)) -(TO_DATE('01'||to_char(to_date(v_BEGINING_DATE), 'MM-YYYY'))))) +1) * v_PercentageGeneral;
                 v_USELIFEMONTHS:=v_USELIFEMONTHS+1;
               ELSE
@@ -307,7 +307,7 @@
               SELECT COALESCE(MAX(A_AMORTIZATION_ID), -1)
               INTO v_NEW_AMORTIZATION
               FROM A_AMORTIZATION
-              WHERE STARTDATE&lt;=v_BEGINING_DATE  AND ENDDATE&gt;=v_BEGINING_DATE  AND AD_CLIENT_ID=v_AD_CLIENT_ID  AND PROCESSED='N';
+              WHERE STARTDATE<=v_BEGINING_DATE  AND ENDDATE>=v_BEGINING_DATE  AND AD_CLIENT_ID=v_AD_CLIENT_ID  AND PROCESSED='N';
               IF(v_NEW_AMORTIZATION=-1) THEN
                 Ad_Sequence_Next('A_Amortization', 1000000, v_NEW_AMORTIZATION) ;
                 INSERT
@@ -325,7 +325,7 @@
               INTO v_LINE
               FROM A_AMORTIZATIONLINE
               WHERE A_AMORTIZATION_ID=v_NEW_AMORTIZATION;
-              IF((v_AMORTIZATIONVALUEAMT*v_PERCENTAGE/100)&gt;(v_AMORTIZATIONVALUEAMT-v_TotalAmt)) THEN
+              IF((v_AMORTIZATIONVALUEAMT*v_PERCENTAGE/100)>(v_AMORTIZATIONVALUEAMT-v_TotalAmt)) THEN
                 SELECT SUM(AMORTIZATIONAMT), SUM(AMORTIZATION_PORCENTAGE)
                 INTO v_AMOUNT, v_PERCENTAGE
                 FROM A_AMORTIZATIONLINE
@@ -335,7 +335,7 @@
                 finish:=true;
               end if;
               v_AMOUNT:=v_AMORTIZATIONVALUEAMT*v_PERCENTAGE/100;
-              IF(v_AMOUNT&gt;0) THEN
+              IF(v_AMOUNT>0) THEN
                 Ad_Sequence_Next('A_Amortizationline', 1000000, v_AMORTIZATIONLINE) ;
                 INSERT
                 INTO A_AMORTIZATIONLINE
@@ -365,7 +365,7 @@
         )
       WHERE a_Asset_ID=v_Record_ID;
     END IF; --FINISH_PROCESS
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     v_ResultStr:='UnLockingAsset';
     UPDATE A_ASSET
       SET Processing='N', Updated=now(), UpdatedBy=v_CREATEDBY
@@ -379,7 +379,7 @@
       DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished - ' || v_Message) ;
       AD_UPDATE_PINSTANCE(p_PInstance_ID, v_CREATEDBY, 'N', v_Result, v_Message) ;
     ELSE
-      DBMS_OUTPUT.PUT_LINE('--&lt;&lt;A_Asset_Post finished&gt;&gt; ' || v_Message) ;
+      DBMS_OUTPUT.PUT_LINE('--<<A_Asset_Post finished>> ' || v_Message) ;
     END IF;
     RETURN;
   END; --BODY
@@ -408,6 +408,7 @@
 -- Commented by cromero 19102006 RETURN;
 END A_Asset_Post
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/A_ASSET_POST0.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/A_ASSET_POST0.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION A_ASSET_POST0">
     <function name="A_ASSET_POST0" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
  * The contents of this file are subject to the Compiere License.  You may
  * obtain a copy of the License at    http://www.compiere.org/license.html
  * Software is on an  "AS IS" basis,  WITHOUT WARRANTY OF ANY KIND, either
@@ -17,6 +17,7 @@
  A_Asset_Post (p_PInstance_ID, NULL);
 END A_Asset_Post0
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/BOM_PRICELIMIT.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/BOM_PRICELIMIT.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -3,14 +3,14 @@
     <function name="BOM_PRICELIMIT" type="NUMERIC">
       <parameter name="p_Product_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_PriceList_Version_ID" type="NUMERIC" mode="in"/>
-      <body>/******************************************************************************
+      <body><![CDATA[/******************************************************************************
 * The contents of this file are subject to the   Compiere License  Version 1.1
 * ("License"); You may not use this file except in compliance with the License
 * You may obtain a copy of the License at http://www.compiere.org/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                  Compiere  ERP &amp;  Business Solution
+* The Original Code is                  Compiere  ERP &  Business Solution
 * The Initial Developer of the Original Code is Jorg Janke  and ComPiere, Inc.
 * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
 * created by ComPiere are Copyright (C) ComPiere, Inc.;   All Rights Reserved.
@@ -50,6 +50,7 @@
     --
     RETURN v_Price;
 END BOM_PriceLimit 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/BOM_PRICELIST.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/BOM_PRICELIST.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -3,14 +3,14 @@
     <function name="BOM_PRICELIST" type="NUMERIC">
       <parameter name="Product_ID" type="NUMERIC" mode="in"/>
       <parameter name="PriceList_Version_ID" type="NUMERIC" mode="in"/>
-      <body>/******************************************************************************
+      <body><![CDATA[/******************************************************************************
 * The contents of this file are subject to the   Compiere License  Version 1.1
 * ("License"); You may not use this file except in compliance with the License
 * You may obtain a copy of the License at http://www.compiere.org/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                  Compiere  ERP &amp;  Business Solution
+* The Original Code is                  Compiere  ERP &  Business Solution
 * The Initial Developer of the Original Code is Jorg Janke  and ComPiere, Inc.
 * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
 * created by ComPiere are Copyright (C) ComPiere, Inc.;   All Rights Reserved.
@@ -51,6 +51,7 @@
     --
     RETURN v_Price;
 END BOM_PriceList
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/BOM_PRICESTD.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/BOM_PRICESTD.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -3,14 +3,14 @@
     <function name="BOM_PRICESTD" type="NUMERIC">
       <parameter name="Product_ID" type="NUMERIC" mode="in"/>
       <parameter name="PriceList_Version_ID" type="NUMERIC" mode="in"/>
-      <body>/******************************************************************************
+      <body><![CDATA[/******************************************************************************
 * The contents of this file are subject to the   Compiere License  Version 1.1
 * ("License"); You may not use this file except in compliance with the License
 * You may obtain a copy of the License at http://www.compiere.org/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                  Compiere  ERP &amp;  Business Solution
+* The Original Code is                  Compiere  ERP &  Business Solution
 * The Initial Developer of the Original Code is Jorg Janke  and ComPiere, Inc.
 * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
 * created by ComPiere are Copyright (C) ComPiere, Inc.;   All Rights Reserved.
@@ -51,6 +51,7 @@
     --
     RETURN v_Price;
 END BOM_PriceStd 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/BOM_QTY_AVAILABLE.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/BOM_QTY_AVAILABLE.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -4,7 +4,7 @@
       <parameter name="p_Product_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_Warehouse_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_Locator_ID" type="NUMERIC" mode="in" default="NULL"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * The contents of this file are subject to the Compiere License
 * Version 2.5.0 ("License"); You may not use this file except in
 * compliance with the License. You may obtain a copy of the License at
@@ -13,7 +13,7 @@
 * "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  Compiere  ERP &amp;  Business Solution
+* The Original Code is  Compiere  ERP &  Business Solution
 * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
 Inc.
 * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -27,6 +27,7 @@
 BEGIN
   RETURN BOM_Qty_OnHand(p_Product_ID, p_Warehouse_ID, p_Locator_ID) - BOM_Qty_Reserved(p_Product_ID, p_Warehouse_ID, p_Locator_ID) ;
 END BOM_Qty_Available
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/BOM_QTY_ONHAND.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/BOM_QTY_ONHAND.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -4,7 +4,7 @@
       <parameter name="p_Product_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_Warehouse_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_Locator_ID" type="NUMERIC" mode="in" default="NULL"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * The contents of this file are subject to the Compiere License
 * Version 2.5.0 ("License"); You may not use this file except in
 * compliance with the License. You may obtain a copy of the License at
@@ -13,7 +13,7 @@
 * "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  Compiere  ERP &amp;  Business Solution
+* The Original Code is  Compiere  ERP &  Business Solution
 * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
 Inc.
 * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -64,7 +64,7 @@
     RETURN 0;
   END;
   -- Unimited capacity if no item
-  IF((v_ProductType&lt;&gt;'I' OR(v_IsStocked='N' AND(v_IsBOM='N')))) THEN
+  IF((v_ProductType<>'I' OR(v_IsStocked='N' AND(v_IsBOM='N')))) THEN
     RETURN v_Quantity;
     -- Stocked item
   ELSIF(v_IsStocked='Y') THEN
@@ -114,19 +114,19 @@
         v_ProductQty:=ROUND(v_ProductQty/CUR_BOM.BOMQty, v_StdPrecision) ;
       END IF;
       -- How much can we make overall
-      IF(v_ProductQty&lt;v_Quantity) THEN
+      IF(v_ProductQty<v_Quantity) THEN
         v_Quantity:=v_ProductQty;
       END IF;
       -- Another BOM
     ELSIF(CUR_BOM.IsBOM='Y') THEN
       v_ProductQty:=Bom_Qty_Onhand(CUR_BOM.M_ProductBOM_ID, v_myWarehouse_ID) ;
       -- How much can we make overall
-      IF(v_ProductQty&lt;v_Quantity) THEN
+      IF(v_ProductQty<v_Quantity) THEN
         v_Quantity:=v_ProductQty;
       END IF;
     END IF;
   END LOOP; -- BOM
-  IF(v_Quantity&gt;0) THEN
+  IF(v_Quantity>0) THEN
     -- Get Rounding Precision for Product
     SELECT COALESCE(MAX(u.StdPrecision), 0)
     INTO v_StdPrecision
@@ -137,6 +137,7 @@
   END IF;
   RETURN 0;
 END Bom_Qty_Onhand 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/BOM_QTY_ORDERED.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/BOM_QTY_ORDERED.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -4,7 +4,7 @@
       <parameter name="p_Product_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_Warehouse_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_Locator_ID" type="NUMERIC" mode="in" default="NULL"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * The contents of this file are subject to the Compiere License
 * Version 2.5.0 ("License"); You may not use this file except in
 * compliance with the License. You may obtain a copy of the License at
@@ -13,7 +13,7 @@
 * "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  Compiere  ERP &amp;  Business Solution
+* The Original Code is  Compiere  ERP &  Business Solution
 * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
 Inc.
 * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -68,7 +68,7 @@
     RETURN 0;
   END;
   --  No reservation for non-stocked
-  IF((v_ProductType &lt;&gt; 'I' OR(v_IsStocked = 'N' AND v_IsBOM = 'N'))) THEN
+  IF((v_ProductType <> 'I' OR(v_IsStocked = 'N' AND v_IsBOM = 'N'))) THEN
     RETURN 0;
     --  Stocked item
   ELSIF(v_IsStocked = 'Y') THEN
@@ -113,14 +113,14 @@
       --  How much can we make with this product
       v_ProductQty := ROUND(v_ProductQty/CUR_BOM.BOMQty, v_StdPrecision) ;
       --  How much can we make overall
-      IF(v_ProductQty &lt; v_Quantity) THEN
+      IF(v_ProductQty < v_Quantity) THEN
         v_Quantity := v_ProductQty;
       END IF;
       --  Another BOM
     ELSIF(CUR_BOM.IsBOM = 'Y') THEN
       v_ProductQty := BOM_Qty_Reserved(CUR_BOM.M_ProductBOM_ID, v_Warehouse_ID) ;
       --  How much can we make overall
-      IF(v_ProductQty &lt; v_Quantity) THEN
+      IF(v_ProductQty < v_Quantity) THEN
         v_Quantity := v_ProductQty;
       END IF;
     END IF;
@@ -129,7 +129,7 @@
   IF(v_Quantity = 99999) THEN
     RETURN 0;
   END IF;
-  IF(v_Quantity &gt; 0) THEN
+  IF(v_Quantity > 0) THEN
     --  Get Rounding Precision for Product
     SELECT COALESCE(MAX(u.StdPrecision), 0)
     INTO v_StdPrecision
@@ -143,6 +143,7 @@
   --
   RETURN 0;
 END BOM_Qty_Ordered
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/BOM_QTY_RESERVED.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/BOM_QTY_RESERVED.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -4,7 +4,7 @@
       <parameter name="p_Product_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_Warehouse_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_Locator_ID" type="NUMERIC" mode="in" default="NULL"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * The contents of this file are subject to the Compiere License
 * Version 2.5.0 ("License"); You may not use this file except in
 * compliance with the License. You may obtain a copy of the License at
@@ -13,7 +13,7 @@
 * "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  Compiere  ERP &amp;  Business Solution
+* The Original Code is  Compiere  ERP &  Business Solution
 * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
 Inc.
 * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -68,7 +68,7 @@
     RETURN 0;
   END;
   -- No reservation for non-stocked
-  IF((v_ProductType &lt;&gt; 'I' OR(v_IsStocked='N' AND v_IsBOM='N'))) THEN
+  IF((v_ProductType <> 'I' OR(v_IsStocked='N' AND v_IsBOM='N'))) THEN
     RETURN 0;
     -- Stocked item
   ELSIF(v_IsStocked='Y') THEN
@@ -113,14 +113,14 @@
       -- How much can we make with this product
       v_ProductQty:=ROUND(v_ProductQty/CUR_BOM.BOMQty, v_StdPrecision) ;
       -- How much can we make overall
-      IF(v_ProductQty &lt; v_Quantity) THEN
+      IF(v_ProductQty < v_Quantity) THEN
         v_Quantity:=v_ProductQty;
       END IF;
       -- Another BOM
     ELSIF(CUR_BOM.IsBOM='Y') THEN
       v_ProductQty:=BOM_Qty_Reserved(CUR_BOM.M_ProductBOM_ID, v_Warehouse_ID) ;
       -- How much can we make overall
-      IF(v_ProductQty &lt; v_Quantity) THEN
+      IF(v_ProductQty < v_Quantity) THEN
         v_Quantity:=v_ProductQty;
       END IF;
     END IF;
@@ -129,7 +129,7 @@
   IF(v_Quantity=99999) THEN
     RETURN 0;
   END IF;
-  IF(v_Quantity &gt; 0) THEN
+  IF(v_Quantity > 0) THEN
     -- Get Rounding Precision for Product
     SELECT COALESCE(MAX(u.StdPrecision), 0)
     INTO v_StdPrecision
@@ -142,6 +142,7 @@
   END IF;
   RETURN 0;
 END BOM_Qty_Reserved
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/CHANGEPROJECTSTATUS.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/CHANGEPROJECTSTATUS.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION CHANGEPROJECTSTATUS">
     <function name="CHANGEPROJECTSTATUS" type="NULL">
       <parameter name="p_pinstance_id" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -78,13 +78,13 @@
       RAISE_APPLICATION_ERROR(-20000, '@Notstatusdefined@');
     ELSIF (v_projectstatus = 'NF' OR v_projectstatus = 'OP')
     THEN
-      IF (v_p_projectstatus &lt;&gt; 'OR' AND v_p_projectstatus &lt;&gt; 'OU')
+      IF (v_p_projectstatus <> 'OR' AND v_p_projectstatus <> 'OU')
       THEN
         RAISE_APPLICATION_ERROR(-20000, '@Invalidprojectstatus@');
       END IF;
     ELSIF (v_projectstatus = 'OR')
     THEN
-      IF (v_p_projectstatus &lt;&gt; 'OC')
+      IF (v_p_projectstatus <> 'OC')
       THEN
         RAISE_APPLICATION_ERROR(-20000, '@Invalidprojectstatus@');
       END IF;
@@ -113,7 +113,7 @@
     RETURN;
   END IF;--FINISH_PROCESS
 
-  --&lt;&lt;FINISH_PROCESS&gt;&gt;
+  --<<FINISH_PROCESS>>
   --  Update AD_PInstance
   DBMS_OUTPUT.PUT_LINE ('Updating PInstance - Finished ' || v_message);
   ad_update_pinstance (p_pinstance_id, NULL, 'N', v_result, v_message);
@@ -128,6 +128,7 @@
 -- Commented by cromero 19102006 RETURN;
 END changeprojectstatus
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/CHANGEPROJECTSTATUSTOORDER.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/CHANGEPROJECTSTATUSTOORDER.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION CHANGEPROJECTSTATUSTOORDER">
     <function name="CHANGEPROJECTSTATUSTOORDER" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -75,7 +75,7 @@
     v_ResultStr:='CheckRestriction';
     IF(v_ProjectStatus IS NULL) THEN
       RAISE_APPLICATION_ERROR(-20000, '@Notprojectstatus@');
-    ELSIF v_ProjectStatus&lt;&gt;'OR' THEN
+    ELSIF v_ProjectStatus<>'OR' THEN
       RAISE_APPLICATION_ERROR(-20000, '@Invalidprojectstatus@');
     END IF;
     IF(NOT FINISH_PROCESS) THEN
@@ -177,7 +177,7 @@
           FROM C_PROJECTLINE
           WHERE C_PROJECT_ID=v_Record_ID
             AND PLANNEDPOPRICE IS NOT NULL;
-          IF v_TotalLines&gt;0 THEN
+          IF v_TotalLines>0 THEN
             v_PriceListPO:=Ad_Sequence_Nextno('M_PriceList') ;
             INSERT
             INTO m_pricelist
@@ -256,7 +256,7 @@
         WHERE c_project_id=v_Record_ID;
       END;
     END IF; --FINISH_PROCESS
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
     AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'N', v_Result, v_Message) ;
@@ -271,6 +271,7 @@
   RETURN;
 END ChangeProjectStatusToOrder
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/CLEVER_TO_NUMBER.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/CLEVER_TO_NUMBER.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION CLEVER_TO_NUMBER">
     <function name="CLEVER_TO_NUMBER" type="NUMERIC">
       <parameter name="p_text" type="VARCHAR"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -26,6 +26,7 @@
 WHEN OTHERS THEN
   RETURN NULL;
 END Clever_To_Number
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/CLOSEPROJECT.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/CLOSEPROJECT.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION CLOSEPROJECT">
     <function name="CLOSEPROJECT" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -67,7 +67,7 @@
     v_ResultStr:='CheckRestriction';
     IF(v_ProjectStatus IS NULL) THEN
       RAISE_APPLICATION_ERROR(-20000, '@Notprojectstatus@');
-    ELSIF v_ProjectStatus&lt;&gt;'OC' THEN
+    ELSIF v_ProjectStatus<>'OC' THEN
       RAISE_APPLICATION_ERROR(-20000, '@Invalidprojectstatus@');
     END IF;
     IF(NOT FINISH_PROCESS) THEN
@@ -110,7 +110,7 @@
         updatedby=v_AD_User_ID
       WHERE c_project_id=v_p_Record_ID;
     END IF; --FINISH_PROCESS
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
     AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'N', v_Result, v_Message) ;
@@ -125,6 +125,7 @@
   RETURN;
 END CloseProject
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/COPY_PRODUCT_TEMPLATE.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/COPY_PRODUCT_TEMPLATE.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION COPY_PRODUCT_TEMPLATE">
     <function name="COPY_PRODUCT_TEMPLATE" type="NULL">
       <parameter name="PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -114,7 +114,7 @@
         (SELECT MAX(VALIDFROM)
         FROM M_PRICELIST_VERSION
         WHERE ISACTIVE='Y'
-          AND VALIDFROM&lt;=TO_CHAR(Now(), 'DD/MM/YYYY')
+          AND VALIDFROM<=TO_CHAR(Now(), 'DD/MM/YYYY')
           AND M_PRICELIST_ID=v_Mpricelist
         )
         AND M_PRICELIST_VERSION.M_PRICELIST_ID=v_Mpricelist
@@ -165,7 +165,7 @@
       v_NoOfLines:=v_NoOfLines + 1;
     END LOOP;
     v_Message:='@Copied@=' || v_NoOfLines ;
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
     Ad_Update_Pinstance(PInstance_ID, NULL, 'N', 1, v_Message) ;
@@ -179,6 +179,7 @@
   RETURN;
 END Copy_Product_Template
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/COPY_PROJECT_LINES.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/COPY_PROJECT_LINES.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION COPY_PROJECT_LINES">
     <function name="COPY_PROJECT_LINES" type="NULL">
       <parameter name="PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -92,7 +92,7 @@
       v_NoOfLines:=v_NoOfLines + 1;
     END LOOP;
     v_Message:='@Copied@=' || v_NoOfLines ;
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
     AD_UPDATE_PINSTANCE(PInstance_ID, NULL, 'N', 1, v_Message) ;
@@ -106,6 +106,7 @@
   RETURN;
 END COPY_PROJECT_LINES
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_ACCTSCHEMA_DEFAULT_COPY.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_ACCTSCHEMA_DEFAULT_COPY.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -3,7 +3,7 @@
     <function name="C_ACCTSCHEMA_DEFAULT_COPY" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_Client_ID" type="NUMERIC" mode="in" default="NULL"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   * Version 2.5.0 ("License"); You may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
@@ -12,7 +12,7 @@
   * "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  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -547,7 +547,7 @@
       v_Created_Total:=v_Created_Total + v_Created;
     END LOOP;
     v_Message:='@Created@=' || v_Created_Total || ', @Updated@=' || v_Updated_Total;
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
     AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'N', 1, v_Message) ;
@@ -561,6 +561,7 @@
   RETURN;
 END C_AcctSchema_Default_Copy
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_BANKSTATEMENT_POST.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_BANKSTATEMENT_POST.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION C_BANKSTATEMENT_POST">
     <function name="C_BANKSTATEMENT_POST" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/************************************************************************* 
+      <body><![CDATA[/************************************************************************* 
   * The contents of this file are subject to the Compiere License 
   * Version 2.5.0 ("License"); You may not use this file except in 
   * compliance with the License. You may obtain a copy of the License at 
@@ -11,7 +11,7 @@
   * "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  Compiere  ERP &amp;  Business Solution 
+  * The Original Code is  Compiere  ERP &  Business Solution 
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere, 
   Inc. 
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, 
@@ -205,7 +205,7 @@
       WHERE c.C_BankStatement_ID=v_Record_ID 
         AND c.C_BANKACCOUNT_ID=b.C_BANKACCOUNT_ID 
         AND Ad_Isorgincluded(c.AD_ORG_ID, b.AD_ORG_ID, b.AD_CLIENT_ID)=-1; 
-      IF v_count&gt;0 THEN 
+      IF v_count>0 THEN 
         RAISE_APPLICATION_ERROR(-20000, '@NotCorrectOrgBankaccount@') ; 
       END IF; 
     END IF;--FINISH_PROCESS 
@@ -253,7 +253,7 @@
         AND l.C_BPARTNER_ID=bp.C_BPARTNER_ID 
         AND(Ad_Isorgincluded(l.AD_ORG_ID, bp.AD_ORG_ID, bp.AD_CLIENT_ID)=-1--To be deprecated, to be fixed. This Check restriction should be checked when debt payment is created. Added by PSarobe 
         OR Ad_Isorgincluded(l.AD_ORG_ID, c.AD_ORG_ID, c.AD_CLIENT_ID)=-1) ; 
-      IF v_count&gt;0 THEN 
+      IF v_count>0 THEN 
         RAISE_APPLICATION_ERROR(-20000, '@Inline@'||v_line||' '||'@NotCorrectOrgDebtpaymentBankstatement@') ; 
       END IF;--Finish added by PSarobe 
     END IF;--FINISH_PROCESS 
@@ -269,8 +269,8 @@
         AND bsl.C_Currency_ID=dp.C_Currency_ID 
         AND CASE dp.IsReceipt WHEN 'Y' THEN -- If IsReceipt = N, amount*-1 
             (dp.Amount-coalesce(dp.WriteOffAmt,0)) ELSE(coalesce(dp.WriteOffAmt,0)-dp.Amount) 
-        END &lt;&gt;(bsl.TrxAmt) ; 
-      IF v_count&gt;0 THEN 
+        END <>(bsl.TrxAmt) ; 
+      IF v_count>0 THEN 
        RAISE_APPLICATION_ERROR(-20000, '@Inline@'||v_line||' '||'@DebtAmountsSamemoneyNoMatch@') ; 
       END IF; 
     END IF;--FINISH_PROCESS 
@@ -285,14 +285,14 @@
       WHERE bsl.C_BankStatement_ID=bs.C_BankStatement_ID 
         AND bsl.C_BankStatement_ID=v_Record_ID 
         AND bsl.C_Debt_Payment_ID=dp.C_Debt_Payment_ID 
-        AND bsl.C_Currency_ID&lt;&gt;dp.C_Currency_ID 
+        AND bsl.C_Currency_ID<>dp.C_Currency_ID 
     AND 
         C_Currency_Round(C_Currency_Convert( 
         (CASE dp.IsReceipt WHEN 'Y' THEN -- If IsReceipt = N, amount*-1 
           (dp.Amount-coalesce(dp.WriteOffAmt,0)) ELSE(coalesce(dp.WriteOffAmt,0)-dp.Amount) 
         END), dp.C_Currency_ID, bsl.C_Currency_ID, bs.StatementDate, NULL, bs.AD_Client_ID, bs.AD_Org_ID),bsl.C_Currency_ID, null) 
-        &lt;&gt; C_Currency_Round(bsl.TrxAmt, bsl.C_Currency_ID, null); 
-      IF v_count&gt;0 THEN 
+        <> C_Currency_Round(bsl.TrxAmt, bsl.C_Currency_ID, null); 
+      IF v_count>0 THEN 
         RAISE_APPLICATION_ERROR(-20000, '@Inline@'||v_line||' '||'@DebtAmountsDifferentMoneyNoMatch@') ; 
       END IF; 
     END IF;--FINISH_PROCESS 
@@ -304,7 +304,7 @@
       WHERE bsl.C_BankStatement_ID=v_Record_ID 
         AND bsl.C_Debt_Payment_ID=dp.C_Debt_Payment_ID 
         AND C_Debt_Payment_Status(dp.C_SETTLEMENT_CANCEL_ID, dp.Cancel_Processed, dp.Generate_Processed, dp.IsPaid, dp.IsValid, dp.C_CashLine_ID, dp.C_BankStatementLine_ID) NOT IN('P', 'A') ; 
-      IF v_count&gt;0 THEN 
+      IF v_count>0 THEN 
         --Added by P.Sarobe. New messages 
     SELECT line, c_Debt_payment_Id INTO v_line, v_C_Debt_Payment_Id 
     FROM C_Bankstatementline WHERE c_Bankstatementline_Id = v_Bankstatementline_ID; 
@@ -344,7 +344,7 @@
        FROM C_BANKSTATEMENTLINE 
      WHERE C_BankStatement_ID=v_Record_ID 
        AND STMTAMT != TRXAMT-CHARGEAMT-CONVERTCHARGEAMT; 
-   IF v_count&gt;0 THEN 
+   IF v_count>0 THEN 
         RAISE_APPLICATION_ERROR(-20000, '@Inline@'||v_line||' '||'@ChargeAmtsDontMatch@'); 
       END IF; 
   END IF; --FINISH_PROCESS 
@@ -358,9 +358,9 @@
         WHERE bsl.C_BankStatement_ID=v_Record_ID 
           AND bsl.C_Debt_Payment_ID=dp.C_Debt_Payment_ID 
         GROUP BY dp.C_Debt_Payment_ID 
-        HAVING COUNT(*)&gt;1 
+        HAVING COUNT(*)>1 
   ) A; 
-      IF v_count&gt;0 THEN 
+      IF v_count>0 THEN 
         --Added by PSarobe. 
      FOR Cur_BankstatementDebtpayment IN (SELECT line 
              FROM c_Bankstatementline 
@@ -527,7 +527,7 @@
     WHERE C_Bankstatement.C_Bankstatement_Id = C_Bankstatementline.C_BANKSTATEMENT_ID 
     AND C_Bankstatementline.C_DEBT_PAYMENT_ID = C_DP_Managementline.C_DEBT_PAYMENT_ID 
     AND C_DP_Managementline.C_DP_MANAGEMENT_ID = C_DP_Management.C_DP_MANAGEMENT_ID 
-    AND C_DP_Management.DATEACCT &gt; C_Bankstatementline.DATEACCT 
+    AND C_DP_Management.DATEACCT > C_Bankstatementline.DATEACCT 
     AND C_Bankstatement.C_Bankstatement_Id = v_Record_ID; 
      RAISE_APPLICATION_ERROR(-20000, '@Inline@'||v_line||' '||'@debtpayment@'||'@DPDebtPaymentManaged@'||v_documentno_Dp_Management||' '||'@DPAccountdatelaterBankstatementlinedate@') ; 
     ELSE 
@@ -573,7 +573,7 @@
             v_Currency_ID:=v_BA_Currency_ID; 
           END IF; 
           v_ResultStr:='CalculatingSum'; 
-          IF(v_Currency_ID&lt;&gt;v_BA_Currency_ID) THEN 
+          IF(v_Currency_ID<>v_BA_Currency_ID) THEN 
             v_Total:=v_Total + C_Currency_Convert(Cur_Lines.StmtAmt, v_Currency_ID, v_BA_Currency_ID, v_BS_Date, NULL, Cur_Lines.AD_Client_ID, Cur_Lines.AD_Org_ID) ; 
           ELSE 
             v_Total:=v_Total + Cur_Lines.StmtAmt; 
@@ -591,7 +591,7 @@
         WHERE C_BankStatement_ID=v_Record_ID; 
       END; 
     END IF;--FINISH_PROCESS 
-    --&lt;&lt;FINISH_PROCESS&gt;&gt; 
+    --<<FINISH_PROCESS>> 
     --  Update AD_PInstance 
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ; 
     AD_UPDATE_PINSTANCE(p_PInstance_ID, v_User, 'N', 1, v_Message) ; 
@@ -605,6 +605,7 @@
   AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'N', 0, v_ResultStr) ; 
   RETURN; 
 END C_Bankstatement_Post
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_BASE_CONVERT.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_BASE_CONVERT.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -6,7 +6,7 @@
       <parameter name="p_Client_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_ConvDate" type="TIMESTAMP" mode="in"/>
       <parameter name="p_Org_ID" type="NUMERIC" mode="in" default="0"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * The contents of this file are subject to the Compiere License
 * Version 2.5.0 ("License"); You may not use this file except in
 * compliance with the License. You may obtain a copy of the License at
@@ -15,7 +15,7 @@
 * "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  Compiere  ERP &amp;  Business Solution
+* The Original Code is  Compiere  ERP &  Business Solution
 * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
 Inc.
 * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -32,7 +32,7 @@
 *  Returns NULL, if conversion not found
 *  Standard Rounding
 * Test:
-*  SELECT C_Base_Convert(100,116,11,null) FROM DUAL =&gt; 64.72
+*  SELECT C_Base_Convert(100,116,11,null) FROM DUAL => 64.72
 ************************************************************************/
     v_CurTo_ID NUMBER;
   BEGIN
@@ -53,6 +53,7 @@
     END IF;
     RETURN C_Currency_Round(  C_Currency_Convert(p_Amount, p_CurFrom_ID, v_CurTo_ID, p_ConvDate, null, p_Client_ID, p_Org_ID), v_CurTo_ID, null) ;
 END C_Base_Convert
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_BPARTNER_REMITLOCATION.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_BPARTNER_REMITLOCATION.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION C_BPARTNER_REMITLOCATION">
     <function name="C_BPARTNER_REMITLOCATION" type="NUMERIC">
       <parameter name="p_C_BPartner_ID" type="NUMERIC"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * The contents of this file are subject to the Compiere License
 * Version 2.5.0 ("License"); You may not use this file except in
 * compliance with the License. You may obtain a copy of the License at
@@ -11,7 +11,7 @@
 * "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  Compiere  ERP &amp;  Business Solution
+* The Original Code is  Compiere  ERP &  Business Solution
 * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
 Inc.
 * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -44,6 +44,7 @@
     END LOOP;
     RETURN v_C_Location_ID;
 END C_BPartner_RemitLocation
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_BP_GROUP_ACCT_COPY.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_BP_GROUP_ACCT_COPY.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -3,7 +3,7 @@
     <function name="C_BP_GROUP_ACCT_COPY" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_BP_Group_ID" type="NUMERIC" mode="in" default="NULL"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   * Version 2.5.0 ("License"); You may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
@@ -12,7 +12,7 @@
   * "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  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -146,7 +146,7 @@
    END LOOP;
 
     v_Message:='@Deleted@=' || v_Deleted || ', @Updated@=' || v_Created;
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished - ' || v_Message) ;
     AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'N', v_myResult, v_Message) ;
@@ -160,6 +160,7 @@
   RETURN;
 END C_BP_Group_Acct_Copy
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_BP_SOCREDITUSED_REFRESH.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_BP_SOCREDITUSED_REFRESH.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION C_BP_SOCREDITUSED_REFRESH">
     <function name="C_BP_SOCREDITUSED_REFRESH" type="NULL">
       <parameter name="p_BPartner_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -29,6 +29,7 @@
   WHERE C_BPartner_ID=p_BPartner_ID;
 END C_BP_SOCREDITUSED_REFRESH
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_BUDGET_COPY.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_BUDGET_COPY.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION C_BUDGET_COPY">
     <function name="C_BUDGET_COPY" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -111,7 +111,7 @@
         )
         ;
     END LOOP;
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished - ' || v_Message) ;
     AD_UPDATE_PINSTANCE(p_PInstance_ID, v_User_ID, 'N', v_Result, v_Message) ;
@@ -125,6 +125,7 @@
     RETURN;
 END C_Budget_Copy
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_CASH_POST.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_CASH_POST.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION C_CASH_POST">
     <function name="C_CASH_POST" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   License
   * compliance with the License. You may obtain a copy of the License at
@@ -11,7 +11,7 @@
   AS IS
   * implied. See the License for the specific language governing rights
   * and limitations under the License.
-  * The Original Code is  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -113,7 +113,7 @@
     AND C_ORDER_ID IS NOT NULL
     AND C_DEBT_PAYMENT_ID IS NOT NULL;
     DBMS_OUTPUT.PUT_LINE ('  Record_ID=' || v_Record_ID);
-    IF (v_Processed = 'Y' AND v_Count&gt;0) THEN
+    IF (v_Processed = 'Y' AND v_Count>0) THEN
     v_Message := '@AlreadyPosted@';
     v_Result := 0;
     FINISH_PROCESS := true;
@@ -217,7 +217,7 @@
       WHERE C_CASH.C_CASHBOOK_ID=C_CASHBOOK.C_CASHBOOK_ID
         AND Ad_Isorgincluded(C_CASH.AD_ORG_ID, C_CASHBOOK.AD_ORG_ID, C_CASHBOOK.AD_CLIENT_ID)=-1
         AND C_CASH_ID=v_Record_ID;
-      IF v_count&gt;0 THEN
+      IF v_count>0 THEN
         RAISE_APPLICATION_ERROR(-20000, '@NotCorrectOrgCashbook@') ;
       END IF;
     END IF;--FINISH_PROCESS
@@ -237,7 +237,7 @@
         AND o.C_BPARTNER_ID=bp.C_BPARTNER_ID
         AND(Ad_Isorgincluded(o.AD_ORG_ID, bp.AD_ORG_ID, bp.AD_CLIENT_ID)=-1
         OR Ad_Isorgincluded(o.AD_ORG_ID, c.AD_ORG_ID, c.AD_CLIENT_ID)=-1) ;
-      IF v_count&gt;0 THEN
+      IF v_count>0 THEN
         RAISE_APPLICATION_ERROR(-20000, '@Inline@'||v_line||' '||'@NotCorrectOrgOrderCashLine@') ;
       END IF;
     END IF;--FINISH_PROCESS
@@ -257,7 +257,7 @@
         AND l.C_BPARTNER_ID=bp.C_BPARTNER_ID
         AND(Ad_Isorgincluded(l.AD_ORG_ID, bp.AD_ORG_ID, bp.AD_CLIENT_ID)=-1 --To be deprecated, to be fixed. This Check restriction should be checked when debt payment is created. Added by PSarobe
         OR Ad_Isorgincluded(l.AD_ORG_ID, c.AD_ORG_ID, c.AD_CLIENT_ID)=-1) ;
-      IF v_count&gt;0 THEN
+      IF v_count>0 THEN
         RAISE_APPLICATION_ERROR(-20000, '@Inline@'||v_line||' '||'@NotCorrectOrgDebtpaymentCashLine@') ;
       END IF;
     END IF;--FINISH_PROCESS
@@ -274,10 +274,10 @@
         (SELECT 1
         FROM C_ORDERLINE ol
         WHERE ol.C_Order_ID=cl.C_Order_ID
-          AND ol.QTYORDERED&lt;&gt;ol.QTYINVOICED
+          AND ol.QTYORDERED<>ol.QTYINVOICED
         )
         ;
-      IF v_count&gt;0 THEN
+      IF v_count>0 THEN
         v_Message:='@CashOrderInvoiced@. Line:'||v_line;
         v_Result:=0;
         FINISH_PROCESS:=true;
@@ -299,8 +299,8 @@
         CASE dp.IsReceipt WHEN 'Y' THEN -- If IsReceipt = N, amount*-1
           (dp.Amount-coalesce(dp.WriteOffAmt,0)) ELSE (coalesce(dp.WriteOffAmt,0)-dp.Amount)
         END
-        &lt;&gt;(cl.Amount+coalesce(cl.WriteOffAmt,0)) ;
-      IF v_count&gt;0 THEN
+        <>(cl.Amount+coalesce(cl.WriteOffAmt,0)) ;
+      IF v_count>0 THEN
        RAISE_APPLICATION_ERROR(-20000, '@Inline@'||v_line||' '||'@DebtAmountsSamemoneyNoMatch@') ;
       END IF;
     END IF;--FINISH_PROCESS
@@ -316,13 +316,13 @@
         AND cl.C_Cash_ID=v_Record_ID
         AND cl.CASHTYPE='P'
         AND cl.C_Debt_Payment_ID=dp.C_Debt_Payment_ID
-        AND cl.C_Currency_ID&lt;&gt;dp.C_Currency_ID
+        AND cl.C_Currency_ID<>dp.C_Currency_ID
         AND
         CASE dp.IsReceipt WHEN 'Y' THEN -- If IsReceipt = N, amount*-1
           (coalesce(dp.Amount,0)-coalesce(dp.WriteOffAmt,0)) ELSE (coalesce(dp.WriteOffAmt,0)-coalesce(dp.Amount,0))
         END
-        &lt;&gt;C_Currency_Round(C_Currency_Convert((coalesce(cl.Amount,0) + coalesce(cl.WriteOffAmt,0)), cl.C_Currency_ID, dp.C_Currency_ID, c.DateAcct, NULL, c.AD_Client_ID, c.AD_Org_ID), dp.C_Currency_ID, NULL) ;
-      IF v_count&gt;0 THEN
+        <>C_Currency_Round(C_Currency_Convert((coalesce(cl.Amount,0) + coalesce(cl.WriteOffAmt,0)), cl.C_Currency_ID, dp.C_Currency_ID, c.DateAcct, NULL, c.AD_Client_ID, c.AD_Org_ID), dp.C_Currency_ID, NULL) ;
+      IF v_count>0 THEN
         RAISE_APPLICATION_ERROR(-20000, '@Inline@'||v_line||' '||'@DebtAmountsDifferentMoneyNoMatch@') ;
       END IF;
     END IF;--FINISH_PROCESS
@@ -380,9 +380,9 @@
           AND cl.CASHTYPE='P'
           AND cl.C_Debt_Payment_ID=dp.C_Debt_Payment_ID
         GROUP BY dp.C_Debt_Payment_ID
-        HAVING COUNT(*)&gt;1
+        HAVING COUNT(*)>1
 		)A;
-      IF v_count&gt;0 THEN
+      IF v_count>0 THEN
 	  --Added by PSarobe. This is also checked in the unique index C_CASHLINE_DEBT_PAYMENT
 	  	 FOR Cur_CashlineDebtpayment IN (SELECT line
 		 	 						 	FROM c_cashline
@@ -407,7 +407,7 @@
         OR(cl.CASHTYPE NOT IN('O', 'P')
         AND(C_ORDER_ID IS NOT NULL
         OR C_DEBT_PAYMENT_ID IS NOT NULL))) ;
-      IF v_count&gt;0 THEN
+      IF v_count>0 THEN
         RAISE_APPLICATION_ERROR(-20000, '@Inline@'||v_line||' '||'@WrongLineTypeAndReferenceCash@');
       END IF;
     END IF;--FINISH_PROCESS
@@ -469,7 +469,7 @@
         C_CASH c
       WHERE cb.C_CashBook_ID=c.C_CashBook_ID
         AND c.C_Cash_ID=v_Record_ID;
-      IF(v_count&gt;0) THEN
+      IF(v_count>0) THEN
         v_SettlementDocType_ID:=Ad_Get_DocType(v_AD_Client_ID, v_AD_Org_ID, 'STT') ;
         Ad_Sequence_Next('C_Settlement', v_Record_ID, v_settlementID) ;
         Ad_Sequence_Doctype(v_SettlementDocType_ID, v_Record_ID, 'Y', v_DocumentNo) ;
@@ -535,7 +535,7 @@
             v_Currency_ID:=v_CB_Currency_ID;
           END IF;
           v_ResultStr:='CalculatingSum';
-          IF(v_Currency_ID&lt;&gt;v_CB_Currency_ID) THEN
+          IF(v_Currency_ID<>v_CB_Currency_ID) THEN
             v_Total:=v_Total + C_Currency_Convert(Cur_Lines.Amount, v_Currency_ID, v_CB_Currency_ID, v_CB_Date, NULL, Cur_Lines.AD_Client_ID, Cur_Lines.AD_Org_ID) ;
           ELSE
             v_Total:=v_Total + Cur_Lines.Amount;
@@ -557,11 +557,11 @@
           SET AD_Client_ID=v_AD_Client_ID,
           AD_Org_ID=v_AD_Org_ID
         WHERE C_Cash_ID=v_Record_ID
-          AND(AD_Client_ID&lt;&gt;v_AD_Client_ID
-          OR AD_Org_ID&lt;&gt;v_AD_Org_ID) ;
+          AND(AD_Client_ID<>v_AD_Client_ID
+          OR AD_Org_ID<>v_AD_Org_ID) ;
       END;
     END IF;--FINISH_PROCESS
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
     AD_UPDATE_PINSTANCE(p_PInstance_ID, v_User, 'N', 1, v_Message) ;
@@ -575,6 +575,7 @@
   AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'N', 0, v_ResultStr) ;
   RETURN;
 END C_Cash_Post
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_COMMISSIONRUN_PROCESS.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_COMMISSIONRUN_PROCESS.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,14 +2,14 @@
   <database name="FUNCTION C_COMMISSIONRUN_PROCESS">
     <function name="C_COMMISSIONRUN_PROCESS" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/******************************************************************************
+      <body><![CDATA[/******************************************************************************
   * The contents of this file are subject to the   Compiere License  Version 1.1
   * ("License"); You may not use this file except in compliance with the License
   * You may obtain a copy of the License at http://www.compiere.org/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                  Compiere  ERP &amp;  Business Solution
+  * The Original Code is                  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere, Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
   * created by ComPiere are Copyright (C) ComPiere, Inc.;   All Rights Reserved.
@@ -200,7 +200,7 @@
  END LOOP;--FINISH_PROCESS
 
 
---&lt;&lt;FINISH_PROCESS&gt;&gt;
+--<<FINISH_PROCESS>>
  --  Update AD_PInstance
  DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message);
     AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'N', v_Result, v_Message);
@@ -217,6 +217,7 @@
 
 END C_Commissionrun_Process
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_COMMISSION_COPY.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_COMMISSION_COPY.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION C_COMMISSION_COPY">
     <function name="C_COMMISSION_COPY" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   * Version 2.5.0 ("License"); You may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
@@ -11,7 +11,7 @@
   * "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  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -112,7 +112,7 @@
           ;
       END LOOP;
     END;
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
     AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'N', 1, v_Message) ;
@@ -127,6 +127,7 @@
   RETURN;
 END C_Commission_Copy
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_COMMISSION_PROCESS.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_COMMISSION_PROCESS.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,14 +2,14 @@
   <database name="FUNCTION C_COMMISSION_PROCESS">
     <function name="C_COMMISSION_PROCESS" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/******************************************************************************
+      <body><![CDATA[/******************************************************************************
   * The contents of this file are subject to the   Compiere License  Version 1.1
   * ("License"); You may not use this file except in compliance with the License
   * You may obtain a copy of the License at http://www.compiere.org/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                  Compiere  ERP &amp;  Business Solution
+  * The Original Code is                  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere, Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
   * created by ComPiere are Copyright (C) ComPiere, Inc.;   All Rights Reserved.
@@ -194,8 +194,8 @@
           || ' AND p.DocStatus IN (''CL'',''CO'')'
           || ' AND h.C_Invoice_ID = l.C_Invoice_ID'
           || ' AND h.AD_Client_ID = :1'
-          || ' AND h.DateInvoiced &gt;= to_date('':2'')'
-          || ' AND h.DateInvoiced &lt; to_date('':3'') +1';
+          || ' AND h.DateInvoiced >= to_date('':2'')'
+          || ' AND h.DateInvoiced < to_date('':3'') +1';
           || ' ';
           ELSE
           v_Cmd := 'SELECT h.C_Currency_ID, SUM(l.LineNetAmt) AS Amt, SUM(l.QtyInvoiced) AS Qty, '
@@ -205,8 +205,8 @@
           || ' AND p.DocStatus IN (''CL'',''CO'')'
           || ' AND h.C_Invoice_ID = l.C_Invoice_ID'
           || ' AND h.AD_Client_ID = :1'
-          || ' AND h.DateInvoiced &gt;= to_date('':2'')'
-          || ' AND h.DateInvoiced &lt; to_date('':3'') +1';
+          || ' AND h.DateInvoiced >= to_date('':2'')'
+          || ' AND h.DateInvoiced < to_date('':3'') +1';
           END IF;*/
           -- Invoice Basis
         ELSIF(v_DocBasisType='I') THEN
@@ -218,8 +218,8 @@
             || ' AND h.DocStatus IN (''CL'',''CO'')'
             || ' AND h.ISSOTRX = ''Y'''
             || ' AND h.AD_Client_ID = :1'
-            || ' AND h.DateInvoiced &gt;= to_date('':2'')'
-            || ' AND h.DateInvoiced &lt; to_date('':3'') +1';
+            || ' AND h.DateInvoiced >= to_date('':2'')'
+            || ' AND h.DateInvoiced < to_date('':3'') +1';
           ELSE
             v_Cmd:='SELECT h.C_Currency_ID, SUM(l.LineNetAmt) AS Amt, SUM(l.QtyInvoiced) AS Qty, '
             || 'NULL, NULL, NULL, NULL '
@@ -228,8 +228,8 @@
             || ' AND h.DocStatus IN (''CL'',''CO'')'
             || ' AND h.ISSOTRX = ''Y'''
             || ' AND h.AD_Client_ID = :1'
-            || ' AND h.DateInvoiced &gt;= to_date('':2'')'
-            || ' AND h.DateInvoiced &lt; to_date('':3'') +1';
+            || ' AND h.DateInvoiced >= to_date('':2'')'
+            || ' AND h.DateInvoiced < to_date('':3'') +1';
           END IF;
           -- Order Basis
         ELSE
@@ -241,8 +241,8 @@
             || ' AND h.DocStatus IN (''CL'',''CO'')'
             || ' AND h.ISSOTRX = ''Y'''
             || ' AND h.AD_Client_ID = :1'
-            || ' AND h.DateOrdered &gt;= to_date('':2'')'
-            || ' AND h.DateOrdered &lt; to_date('':3'') +1';
+            || ' AND h.DateOrdered >= to_date('':2'')'
+            || ' AND h.DateOrdered < to_date('':3'') +1';
           ELSE
             v_Cmd:='SELECT h.C_Currency_ID, SUM(l.LineNetAmt) AS Amt, SUM(l.QtyOrdered) AS Qty, '
             || 'NULL, NULL, NULL, NULL '
@@ -251,8 +251,8 @@
             || ' AND h.DocStatus IN (''CL'',''CO'')'
             || ' AND h.ISSOTRX = ''Y'''
             || ' AND h.AD_Client_ID = :1'
-            || ' AND h.DateOrdered &gt;= to_date('':2'')'
-            || ' AND h.DateOrdered &lt; to_date('':3'') +1';
+            || ' AND h.DateOrdered >= to_date('':2'')'
+            || ' AND h.DateOrdered < to_date('':3'') +1';
           END IF;
         END IF;
         -- CommissionOrders/Invoices
@@ -284,7 +284,7 @@
           v_Cmd:=v_Cmd || ' AND l.M_Product_ID IN '  || '(SELECT M_Product_ID FROM M_Product WHERE M_Product_Category_ID=' || CUR_CLine.M_Product_Category_ID ||')';
         END IF;
         -- Grouping
-        IF(v_ListDetails&lt;&gt;'Y') THEN
+        IF(v_ListDetails<>'Y') THEN
           v_Cmd:=v_Cmd || ' GROUP BY h.C_Currency_ID';
         END IF;
         --
@@ -334,7 +334,7 @@
       END LOOP; -- For every Commission Line
     END;
     v_Message:='@CommissionRun@ = ' || v_DocumentNo || ' - ' || v_Name;
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
     AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'N', 1, v_Message) ;
@@ -349,6 +349,7 @@
   RETURN;
 END C_Commission_Process
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_CONVERTDOCUMENTNO_TO_NUMBER.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_CONVERTDOCUMENTNO_TO_NUMBER.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION C_CONVERTDOCUMENTNO_TO_NUMBER">
     <function name="C_CONVERTDOCUMENTNO_TO_NUMBER" type="NUMERIC">
       <parameter name="p_DocumentNo" type="VARCHAR" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -32,6 +32,7 @@
 WHEN OTHERS THEN
   RETURN 0;
 END C_ConvertDocumentNo_To_Number
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_CREATE_PINVOICE_FROM_OUTS.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_CREATE_PINVOICE_FROM_OUTS.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION C_CREATE_PINVOICE_FROM_OUTS">
     <function name="C_CREATE_PINVOICE_FROM_OUTS" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -124,11 +124,11 @@
         AND p.C_Project_ID=pv.C_Project_ID
         AND sl.M_Locator_ID=l.M_Locator_ID
         AND s.IsSOTrx='Y'
-        AND s.MovementDate&gt;=v_DateFrom
-        AND s.MovementDate&lt;v_DateTo + 1
+        AND s.MovementDate>=v_DateFrom
+        AND s.MovementDate<v_DateTo + 1
         AND l.M_Warehouse_ID=v_Warehouse_ID
         AND pv.C_BPartner_ID=v_BPartner_ID
-        AND sl.MovementQty&lt;&gt;0
+        AND sl.MovementQty<>0
       UNION ALL
       SELECT s.AD_Client_ID,
         s.AD_Org_ID,
@@ -149,11 +149,11 @@
         AND s.C_Project_ID=p.C_Project_ID
         AND p.C_Project_ID=pv.C_Project_ID
         AND sl.M_Locator_ID=l.M_Locator_ID
-        AND s.MovementDate&gt;=v_DateFrom
-        AND s.MovementDate&lt;v_DateTo + 1
+        AND s.MovementDate>=v_DateFrom
+        AND s.MovementDate<v_DateTo + 1
         AND l.M_Warehouse_ID=v_Warehouse_ID
         AND pv.C_BPartner_ID=v_BPartner_ID
-        AND sl.MovementQty&lt;&gt;0
+        AND sl.MovementQty<>0
       ORDER BY C_Project_ID,
         M_Product_ID,
         C_UOM_ID,
@@ -161,7 +161,7 @@
       )
     LOOP
       v_BPLocation_ID:=C_Getbplocationid(v_BPartner_ID, 'B') ;
-      IF(v_Project_ID&lt;&gt;Cur_Outs.C_Project_ID) THEN
+      IF(v_Project_ID<>Cur_Outs.C_Project_ID) THEN
         v_NoRecords:=v_NoRecords + 1;
         v_Project_ID:=Cur_Outs.C_Project_ID;
         v_line:=0;
@@ -254,7 +254,7 @@
           M_INOUT d
         WHERE d.M_InOut_ID=dl.M_InOut_ID
           AND d.IsSOTrx='N'
-          AND dl.MovementQty&lt;&gt;COALESCE(A.QTY, 0)
+          AND dl.MovementQty<>COALESCE(A.QTY, 0)
           AND d.C_BPartner_ID=v_BPartner_ID
           AND dl.M_Product_ID=Cur_Outs.M_Product_ID
           AND(dl.M_ATTRIBUTESETInstance_ID=Cur_Outs.M_AttributeSetInstance_ID
@@ -293,11 +293,11 @@
             Cur_Outs.quantityOrder*(v_auxQty/Cur_Outs.MovementQty), Cur_Outs.M_Product_UOM_ID, v_priceActual
           )
           ;
-        IF(v_auxQtyTotal&gt;=Cur_Outs.MovementQty) THEN
+        IF(v_auxQtyTotal>=Cur_Outs.MovementQty) THEN
           EXIT;
         END IF;
       END LOOP;
-      IF(v_auxQtyTotal&lt;Cur_Outs.MovementQty) THEN
+      IF(v_auxQtyTotal<Cur_Outs.MovementQty) THEN
         v_line:=v_line + 10;
         v_auxQty:=Cur_Outs.MovementQty - v_auxQtyTotal;
         Ad_Sequence_Next('C_InvoiceLine', Cur_Outs.AD_Client_ID, v_InvoiceLine_ID) ;
@@ -329,7 +329,7 @@
           ;
       END IF;
     END LOOP;
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     v_Message:=v_Message || '@Created@: ' || v_NoRecords;
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
@@ -344,6 +344,7 @@
   Ad_Update_Pinstance(p_PInstance_ID, NULL, 'N', 0, v_Message) ;
 END C_Create_Pinvoice_From_Outs
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_CURRENCY_CONVERT.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_CURRENCY_CONVERT.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -8,7 +8,7 @@
       <parameter name="p_RateType" type="CHAR" mode="in"/>
       <parameter name="p_Client_ID" type="NUMERIC" mode="in" default="0"/>
       <parameter name="p_Org_ID" type="NUMERIC" mode="in" default="0"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * The contents of this file are subject to the Compiere License
 * Version 2.5.0 ("License"); You may not use this file except in
 * compliance with the License. You may obtain a copy of the License at
@@ -17,7 +17,7 @@
 * "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  Compiere  ERP &amp;  Business Solution
+* The Original Code is  Compiere  ERP &  Business Solution
 * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
 Inc.
 * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -34,7 +34,7 @@
 *  Returns NULL, if conversion not found
 *  Standard Rounding
 * Test:
-*  SELECT C_Currency_Convert(100,116,100,null,null) FROM DUAL =&gt; 64.72
+*  SELECT C_Currency_Convert(100,116,100,null,null) FROM DUAL => 64.72
 ************************************************************************/
   v_Rate NUMBER;
 BEGIN
@@ -54,6 +54,7 @@
   -- Standard Precision
   RETURN C_Currency_Round(p_Amount * v_Rate, p_CurTo_ID, null) ;
 END C_Currency_Convert
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_CURRENCY_CONVERT0.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_CURRENCY_CONVERT0.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -8,7 +8,7 @@
       <parameter name="p_RateType" type="CHAR" mode="in"/>
       <parameter name="p_Client_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_Org_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * The contents of this file are subject to the Compiere License
 * Version 2.5.0 ("License"); You may not use this file except in
 * compliance with the License. You may obtain a copy of the License at
@@ -17,7 +17,7 @@
 * "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  Compiere  ERP &amp;  Business Solution
+* The Original Code is  Compiere  ERP &  Business Solution
 * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
 Inc.
 * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -34,7 +34,7 @@
 *  standard precision
 *  Returns NULL, if conversion not found
 * Test:
-*  SELECT C_Currency_Convert0(100,'CND','USD',null,null) FROM DUAL =&gt; 64.72
+*  SELECT C_Currency_Convert0(100,'CND','USD',null,null) FROM DUAL => 64.72
 ************************************************************************/
   v_CurFrom_ID NUMBER(10):=NULL;
   v_CurTo_ID   NUMBER(10):=NULL;
@@ -59,6 +59,7 @@
   -- Convert it
   RETURN C_Currency_Convert(p_amount, v_CurFrom_ID, v_CurTo_ID, p_ConvDate, p_RateType, p_Client_ID, p_Org_ID) ;
 END C_Currency_Convert0
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_CURRENCY_RATE.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_CURRENCY_RATE.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -7,7 +7,7 @@
       <parameter name="p_RateType" type="CHAR" mode="in"/>
       <parameter name="p_Client_ID" type="NUMERIC" mode="in" default="0"/>
       <parameter name="p_Org_ID" type="NUMERIC" mode="in" default="0"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * The contents of this file are subject to the Compiere License
 * Version 2.5.0 ("License"); You may not use this file except in
 * compliance with the License. You may obtain a copy of the License at
@@ -16,7 +16,7 @@
 * "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  Compiere  ERP &amp;  Business Solution
+* The Original Code is  Compiere  ERP &  Business Solution
 * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
 Inc.
 * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -32,7 +32,7 @@
 *  from CurrencyFrom_ID to CurrencyTo_ID
 *  Returns NULL, if rate not found
 * Test
-*  SELECT C_Currency_Rate(116, 100, null, null) FROM DUAL; =&gt; .647169
+*  SELECT C_Currency_Rate(116, 100, null, null) FROM DUAL; => .647169
 ************************************************************************/
   -- Currency From variables
   v_cf_IsEuro      char(1);
@@ -96,22 +96,22 @@
     RETURN NULL;
   END IF;
   -- Fixed - From Euro to EMU
-  IF(v_cf_IsEuro = 'Y' AND v_ct_IsEMUMember = 'Y' AND v_ConvDate &gt;= v_ct_EMUEntryDate) THEN
+  IF(v_cf_IsEuro = 'Y' AND v_ct_IsEMUMember = 'Y' AND v_ConvDate >= v_ct_EMUEntryDate) THEN
     RETURN v_ct_EMURate;
   END IF;
   -- Fixed - From EMU to Euro
-  IF(v_ct_IsEuro = 'Y' AND v_cf_IsEMUMember = 'Y' AND v_ConvDate &gt;= v_cf_EMUEntryDate) THEN
+  IF(v_ct_IsEuro = 'Y' AND v_cf_IsEMUMember = 'Y' AND v_ConvDate >= v_cf_EMUEntryDate) THEN
     RETURN 1 / v_cf_EMURate;
   END IF;
   -- Fixed - From EMU to EMU
-  IF(v_cf_IsEMUMember = 'Y' AND v_cf_IsEMUMember = 'Y'  AND v_ConvDate &gt;= v_cf_EMUEntryDate AND v_ConvDate &gt;= v_ct_EMUEntryDate) THEN
+  IF(v_cf_IsEMUMember = 'Y' AND v_cf_IsEMUMember = 'Y'  AND v_ConvDate >= v_cf_EMUEntryDate AND v_ConvDate >= v_ct_EMUEntryDate) THEN
     RETURN v_ct_EMURate / v_cf_EMURate;
   END IF;
   -- Flexible Rates
   v_CurrencyFrom := p_CurFrom_ID;
   v_CurrencyTo := p_CurTo_ID;
   -- if EMU Member involved, replace From/To Currency
-  IF((v_cf_isEMUMember = 'Y' AND v_ConvDate &gt;= v_cf_EMUEntryDate) OR(v_ct_isEMUMember = 'Y' AND v_ConvDate &gt;= v_ct_EMUEntryDate)) THEN
+  IF((v_cf_isEMUMember = 'Y' AND v_ConvDate >= v_cf_EMUEntryDate) OR(v_ct_isEMUMember = 'Y' AND v_ConvDate >= v_ct_EMUEntryDate)) THEN
     SELECT MAX(C_Currency_ID)
     INTO v_CurrencyEuro
     FROM C_Currency
@@ -121,7 +121,7 @@
       DBMS_OUTPUT.PUT_LINE('Euro Not Found') ;
       RETURN NULL;
     END IF;
-    IF(v_cf_isEMUMember = 'Y' AND v_ConvDate &gt;= v_cf_EMUEntryDate) THEN
+    IF(v_cf_isEMUMember = 'Y' AND v_ConvDate >= v_cf_EMUEntryDate) THEN
       v_CurrencyFrom := v_CurrencyEuro;
     ELSE
       v_CurrencyTo := v_CurrencyEuro;
@@ -157,11 +157,11 @@
     RETURN NULL;
   END IF;
   -- Currency From was EMU
-  IF(v_cf_isEMUMember = 'Y' AND v_ConvDate &gt;= v_cf_EMUEntryDate) THEN
+  IF(v_cf_isEMUMember = 'Y' AND v_ConvDate >= v_cf_EMUEntryDate) THEN
     RETURN v_Rate / v_cf_EMURate;
   END IF;
   -- Currency To was EMU
-  IF(v_ct_isEMUMember = 'Y' AND v_ConvDate &gt;= v_ct_EMUEntryDate) THEN
+  IF(v_ct_isEMUMember = 'Y' AND v_ConvDate >= v_ct_EMUEntryDate) THEN
     RETURN v_Rate * v_ct_EMURate;
   END IF;
   RETURN v_Rate;
@@ -170,6 +170,7 @@
   DBMS_OUTPUT.PUT_LINE(SQLERRM) ;
   RETURN NULL;
 END C_Currency_Rate
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_CURRENCY_ROUND.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_CURRENCY_ROUND.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -4,7 +4,7 @@
       <parameter name="p_Amount" type="NUMERIC" mode="in"/>
       <parameter name="p_CurTo_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_Costing" type="VARCHAR" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * The contents of this file are subject to the Compiere License
 * Version 2.5.0 ("License"); You may not use this file except in
 * compliance with the License. You may obtain a copy of the License at
@@ -13,7 +13,7 @@
 * "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  Compiere  ERP &amp;  Business Solution
+* The Original Code is  Compiere  ERP &  Business Solution
 * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
 Inc.
 * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -29,7 +29,7 @@
 *  Round Amount using Costing or Standard Precision
 *  Returns unmodified amount if currency not found
 * Test:
-*  SELECT C_Currency_Round(C_Currency_Convert(100,116,100,null,null),100,null) FROM DUAL =&gt; 64.72
+*  SELECT C_Currency_Round(C_Currency_Convert(100,116,100,null,null),100,null) FROM DUAL => 64.72
 ************************************************************************/
   v_StdPrecision  NUMBER;
   v_CostPrecision NUMBER;
@@ -54,6 +54,7 @@
   END IF;
   RETURN ROUND(p_Amount, v_StdPrecision) ;
 END C_Currency_Round 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_DATEDAYINMONTH.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_DATEDAYINMONTH.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -3,7 +3,7 @@
     <function name="C_DATEDAYINMONTH" type="TIMESTAMP">
       <parameter name="p_Day" type="NUMERIC" mode="in"/>
       <parameter name="p_Date" type="TIMESTAMP" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -25,11 +25,12 @@
   v_DateAux DATE;
 BEGIN
   v_DateAux := LAST_DAY(p_Date) ;
-  IF(TO_NUMBER(TO_CHAR(v_DateAux, 'DD')) &gt; p_Day) THEN
+  IF(TO_NUMBER(TO_CHAR(v_DateAux, 'DD')) > p_Day) THEN
     v_DateAux := TO_DATE(LPAD(TO_CHAR(p_Day), 2, '0') ||'/'||TO_CHAR(p_Date, 'MM/YYYY'), 'DD/MM/YYYY') ;
   END IF;
   RETURN v_DateAux;
 END C_DateDayInMonth
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_DB_PERCENTAJE_PAID.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_DB_PERCENTAJE_PAID.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION C_DB_PERCENTAJE_PAID">
     <function name="C_DB_PERCENTAJE_PAID" type="NUMERIC">
       <parameter name="p_Debt_Payment_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -41,6 +41,7 @@
   END IF;
   RETURN ROUND(v_percentaje,4);
 END C_DB_PERCENTAJE_PAID
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_DEBT_PAYMENT_CHANGE.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_DEBT_PAYMENT_CHANGE.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION C_DEBT_PAYMENT_CHANGE">
     <function name="C_DEBT_PAYMENT_CHANGE" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -101,7 +101,7 @@
         WHERE C_Debt_Payment_ID=v_Record_ID;
       END IF;
     END IF; --FINISH_PROCESS
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
     AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'N', v_Result, v_Message) ;
@@ -116,6 +116,7 @@
   RETURN;
 END C_Debt_Payment_Change
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_DEBT_PAYMENT_CREATE.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_DEBT_PAYMENT_CREATE.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION C_DEBT_PAYMENT_CREATE">
     <function name="C_DEBT_PAYMENT_CREATE" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -214,7 +214,7 @@
       C_Debt_Payment_Create='Y'
     WHERE C_BankStatementLine_ID=v_Record_ID;
     --  v_Message := 'Sett: '||v_SettlementID||' debt: '||v_debtPaymentID;
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
     AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'N', v_Result, v_Message) ;
@@ -228,6 +228,7 @@
   AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'N', 0, v_ResultStr) ;
   RETURN;
 END c_debt_payment_Create
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_DEBT_PAYMENT_PAID.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_DEBT_PAYMENT_PAID.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION C_DEBT_PAYMENT_PAID">
     <function name="C_DEBT_PAYMENT_PAID" type="CHAR">
       <parameter name="p_DebtPaymentID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -39,6 +39,7 @@
   END IF;
   RETURN v_paid;
 END C_Debt_Payment_Paid
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_DEBT_PAYMENT_STATUS.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_DEBT_PAYMENT_STATUS.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -8,7 +8,7 @@
       <parameter name="p_IsValid" type="CHAR" mode="in"/>
       <parameter name="p_C_CashLine_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_C_BankStatementLine_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -47,6 +47,7 @@
   END IF;
   RETURN v_Display;
 END C_DEBT_PAYMENT_STATUS 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_DEBT_PAYMENT_STATUS0.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_DEBT_PAYMENT_STATUS0.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION C_DEBT_PAYMENT_STATUS0">
     <function name="C_DEBT_PAYMENT_STATUS0" type="CHAR">
       <parameter name="p_Debt_Payment_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -35,6 +35,7 @@
 
   RETURN v_Display;
 END C_DEBT_PAYMENT_STATUS0
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_DP_MANAGEMENT_POST.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_DP_MANAGEMENT_POST.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -3,7 +3,7 @@
     <function name="C_DP_MANAGEMENT_POST" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_DP_Management_ID" type="NUMERIC" mode="in" default="NULL"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -89,7 +89,7 @@
       END LOOP; --  Get Parameter
       DBMS_OUTPUT.PUT_LINE('  Record_ID=' || v_Record_ID) ;
     ELSE
-      DBMS_OUTPUT.PUT_LINE('--&lt;&lt;C_Settlement_Post&gt;&gt;') ;
+      DBMS_OUTPUT.PUT_LINE('--<<C_Settlement_Post>>') ;
       v_Record_ID:=p_DP_Management_ID;
     END IF;
   BEGIN --BODY
@@ -205,7 +205,7 @@
       FROM C_DP_Management m,
        C_DocType
       WHERE C_DocType.DocBaseType IN ('DPM')
-     AND AD_ISORGINCLUDED(M.AD_Org_ID,C_DocType.AD_Org_ID, M.AD_Client_ID) &lt;&gt; -1
+     AND AD_ISORGINCLUDED(M.AD_Org_ID,C_DocType.AD_Org_ID, M.AD_Client_ID) <> -1
     AND M.C_DOCTYPE_ID = C_DOCTYPE.C_DOCTYPE_ID
     AND M.C_DP_MANAGEMENT_ID=V_RECORD_ID;
 
@@ -239,7 +239,7 @@
         FROM C_DP_ManagementLine
         WHERE C_DP_Management_ID=v_Record_ID
         GROUP BY C_Debt_Payment_ID
-        HAVING count(*)&gt;1
+        HAVING count(*)>1
         )
         A;
       IF v_Aux!=0 THEN
@@ -266,7 +266,7 @@
         WHERE m1.C_DP_Management_ID=ml1.C_DP_Management_ID
           AND ml1.C_Debt_Payment_ID=ml.C_Debt_Payment_ID
           AND m1.processed='Y'
-          AND m1.DateAcct&gt;m.DateAcct
+          AND m1.DateAcct>m.DateAcct
         )
         ;
       if v_Aux!=0 then
@@ -290,13 +290,13 @@
         WHERE C_Debt_Payment_ID=Cur_Lines.C_Debt_Payment_ID;
       end loop;
     END IF;--FINISH_PROCESS
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     --  Update AD_PInstance
     IF(p_PInstance_ID IS NOT NULL) THEN
       DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
       AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'N', v_Result, v_Message) ;
     ELSE
-      DBMS_OUTPUT.PUT_LINE('--&lt;&lt;C_DP_Management_Post finished&gt;&gt; ' || v_Message) ;
+      DBMS_OUTPUT.PUT_LINE('--<<C_DP_Management_Post finished>> ' || v_Message) ;
       IF(v_Result=0) THEN
         RAISE_APPLICATION_ERROR(-20100, v_Message) ;
       END IF;
@@ -332,6 +332,7 @@
   RETURN;
 END C_DP_Management_Post
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_ELEMENTVALUE_COPY.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_ELEMENTVALUE_COPY.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -3,7 +3,7 @@
     <function name="C_ELEMENTVALUE_COPY" type="NULL">
       <parameter name="p_Source_Element_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_Target_Element_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   * Version 2.5.0 ("License"); You may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
@@ -12,7 +12,7 @@
   * "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  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -75,6 +75,7 @@
     -- Commented by cromero 19102006 COMMIT;
 END C_ElementValue_Copy
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_GETBPLOCATIONID.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_GETBPLOCATIONID.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -3,7 +3,7 @@
     <function name="C_GETBPLOCATIONID" type="NUMERIC">
       <parameter name="p_BPartnerID" type="NUMERIC"/>
       <parameter name="p_LocationType" type="CHAR"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -99,6 +99,7 @@
     END IF;
     RETURN v_BPLocationID;
 END C_GetBPLocationID 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_GETTAX.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_GETTAX.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -9,7 +9,7 @@
       <parameter name="p_shipBPartnerLoc_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_Project_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_IsSOTrx" type="CHAR" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -90,7 +90,7 @@
             ON(t.AD_Client_ID = o.AD_Client_ID)
           WHERE t.ISTAXEXEMPT = 'Y'
             AND o.AD_Org_ID = p_Org_ID
-            AND t.ValidFrom &lt;= p_shipDate
+            AND t.ValidFrom <= p_shipDate
             AND t.isActive = 'Y'
           ORDER BY t.VALIDFROM DESC
           )
@@ -155,7 +155,7 @@
             AND lt.C_Location_ID = v_shipTo
             AND(t.To_Country_ID = lt.C_Country_ID OR(t.To_Country_ID IS NULL))
             AND(t.To_Region_ID = lt.C_Region_ID   OR(t.To_Region_ID IS NULL))
-            AND t.ValidFrom &lt;= p_shipDate
+            AND t.ValidFrom <= p_shipDate
          --   AND ((t.C_BP_TaxCategory_ID = v_BPTaxCategory) OR (v_BPTaxCategory IS NULL))
             AND ((t.C_BP_TaxCategory_ID IS NOT NULL AND t.C_BP_TaxCategory_ID = v_BPTaxCategory) OR (t.C_BP_TaxCategory_ID IS NULL))
             AND (SoPoType = 'B' OR (SoPoType =(case when p_IsSOTrx='Y' then 'S' else 'P' end)))
@@ -194,7 +194,7 @@
               OR(t.C_Region_ID IS NULL))
               AND t.To_Country_ID IS NULL
               AND t.To_Region_ID IS NULL
-              AND t.ValidFrom &lt;= p_shipDate
+              AND t.ValidFrom <= p_shipDate
               --AND ((t.C_BP_TaxCategory_ID = v_BPTaxCategory) OR (v_BPTaxCategory IS NULL))
               AND ((t.C_BP_TaxCategory_ID IS NOT NULL AND t.C_BP_TaxCategory_ID = v_BPTaxCategory) OR (t.C_BP_TaxCategory_ID IS NULL))
               AND (SoPoType = 'B' OR (SoPoType =(case when p_IsSOTrx='Y' then 'S' else 'P' end)))
@@ -215,7 +215,7 @@
             WHERE t.AD_Client_ID = lf.AD_Client_ID
               AND lf.C_Location_ID = v_billFrom
               AND t.IsDefault = 'Y'
-              AND t.ValidFrom &lt;= p_shipDate
+              AND t.ValidFrom <= p_shipDate
               --AND ((t.C_BP_TaxCategory_ID = v_BPTaxCategory) OR (v_BPTaxCategory IS NULL))
               AND ((t.C_BP_TaxCategory_ID IS NOT NULL AND t.C_BP_TaxCategory_ID = v_BPTaxCategory) OR (t.C_BP_TaxCategory_ID IS NULL))
               AND (SoPoType = 'B' OR (SoPoType =(case when p_IsSOTrx='Y' then 'S' else 'P' end)))
@@ -231,6 +231,7 @@
     END IF;
     RETURN v_TaxID;
 END C_GetTax 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_IGNORE_ACCENT.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_IGNORE_ACCENT.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION C_IGNORE_ACCENT">
     <function name="C_IGNORE_ACCENT" type="VARCHAR">
       <parameter name="v_str" type="VARCHAR"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -21,6 +21,7 @@
 BEGIN
   RETURN(TRANSLATE(upper(C_TRIM(v_str)), CHR(50049) || CHR(50048) || CHR(50050) || CHR(50052) || CHR(50057) || CHR(50056) || CHR(50058) || CHR(50059) || CHR(50061) || CHR(50060) || CHR(50062) || CHR(50063) || CHR(50067) || CHR(50066) || CHR(50068) || CHR(50070) || CHR(50074) || CHR(50073) || CHR(50075) || CHR(50076) || CHR(50065) || CHR(35) || CHR(50055), 'AAAAEEEEIIIIOOOOUUUUNNC')) ;
 END C_IGNORE_ACCENT
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_INVOICETODATE.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_INVOICETODATE.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -5,7 +5,7 @@
       <parameter name="p_invoiceDay" type="NUMERIC" mode="in"/>
       <parameter name="p_invoiceCutOff" type="NUMERIC" mode="in"/>
       <parameter name="p_date" type="TIMESTAMP" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -34,33 +34,33 @@
   v_invoiceCutOff:=p_invoiceCutOff;
   v_date:=TRUNC(p_date) ;
   IF(p_invoiceFrecuency IN('T')) THEN
-    IF(TO_NUMBER(TO_CHAR(v_date, 'DD')) &lt; v_invoiceDay) THEN
+    IF(TO_NUMBER(TO_CHAR(v_date, 'DD')) < v_invoiceDay) THEN
       v_invoiceDay:=v_invoiceDay + 15;
     END IF;
-    IF((v_invoiceDay &lt; v_invoiceCutOff) OR((v_invoiceCutOff+15) &lt;= v_invoiceDay)) THEN
+    IF((v_invoiceDay < v_invoiceCutOff) OR((v_invoiceCutOff+15) <= v_invoiceDay)) THEN
       v_invoiceCutOff:=v_invoiceCutOff + 15;
     END IF;
   END IF;
   IF(p_invoiceFrecuency IN('M', 'T')) THEN
     -- If date before invoiceDay (and date is not last month day) go to last month
-    IF((TO_NUMBER(TO_CHAR(v_date, 'DD')) &lt; p_invoiceDay) AND(v_date &lt; LAST_DAY(v_date))) THEN
+    IF((TO_NUMBER(TO_CHAR(v_date, 'DD')) < p_invoiceDay) AND(v_date < LAST_DAY(v_date))) THEN
       v_auxDate:=C_DATEDAYINMONTH(v_invoiceDay, to_date(ADD_MONTHS(v_date, -1), 'DD-MM-YYYY')) ;
     ELSE
       v_auxDate:=C_DATEDAYINMONTH(v_invoiceDay, v_date) ;
     END IF;
-    IF((TO_NUMBER(TO_CHAR(v_auxDate, 'DD')) &lt; v_invoiceCutOff) AND(v_auxDate &lt; LAST_DAY(v_auxDate))) THEN
+    IF((TO_NUMBER(TO_CHAR(v_auxDate, 'DD')) < v_invoiceCutOff) AND(v_auxDate < LAST_DAY(v_auxDate))) THEN
       v_invoiceToDate:=C_DATEDAYINMONTH(v_invoiceCutOff, to_date(ADD_MONTHS(v_auxDate, -1), 'DD-MM-YYYY')) ;
     ELSE
       v_invoiceToDate:=C_DATEDAYINMONTH(v_invoiceCutOff, v_auxDate) ;
     END IF;
   ELSIF(p_invoiceFrecuency IN('W')) THEN
     v_auxDate:=v_date;
-    WHILE(TO_CHAR(v_auxDate, 'D') &lt;&gt; v_invoiceDay)
+    WHILE(TO_CHAR(v_auxDate, 'D') <> v_invoiceDay)
     LOOP
       v_auxDate:=v_auxDate - 1;
     END LOOP;
     v_invoiceToDate:=v_auxDate;
-    WHILE(TO_CHAR(v_invoiceToDate, 'D') &lt;&gt; v_invoiceCutOff)
+    WHILE(TO_CHAR(v_invoiceToDate, 'D') <> v_invoiceCutOff)
     LOOP
       v_invoiceToDate:=v_invoiceToDate - 1;
     END LOOP;
@@ -71,6 +71,7 @@
   END IF;
   RETURN v_invoiceToDate;
 END C_InvoiceToDate
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_INVOICE_ACCTGEN.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_INVOICE_ACCTGEN.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -3,7 +3,7 @@
     <function name="C_INVOICE_ACCTGEN" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_Invoice_ID" type="NUMERIC" mode="in" default="NULL"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   * Version 2.5.0 ("License"); You may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
@@ -12,7 +12,7 @@
   * "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  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -104,7 +104,7 @@
         NULL;
       END LOOP; -- For all accounting schema
     END LOOP; -- Process all invoices
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     IF(p_PInstance_ID IS NOT NULL) THEN
       --  Update AD_PInstance
       DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
@@ -140,6 +140,7 @@
   RETURN;
 END C_Invoice_AcctGen
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_INVOICE_CANCEL.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_INVOICE_CANCEL.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -3,7 +3,7 @@
     <function name="C_INVOICE_CANCEL" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_Order_ID" type="NUMERIC" mode="in" default="NULL"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   * Version 2.5.0 ("License"); You may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
@@ -12,7 +12,7 @@
   * "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  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -69,7 +69,7 @@
       (SELECT *
       FROM C_Invoice
       WHERE C_Order_ID=v_Record_ID
-        AND DocStatus&lt;&gt;'RE' -- Not the existing reversal trx
+        AND DocStatus<>'RE' -- Not the existing reversal trx
         FOR UPDATE
       )
     LOOP
@@ -81,7 +81,7 @@
       WHERE C_Invoice.C_Invoice_ID=Cur_Invoice.C_Invoice_ID ;
       C_Invoice_Post(NULL, Cur_Invoice.C_Invoice_ID) ;
     END LOOP; -- Order Loop
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     IF(p_PInstance_ID IS NOT NULL) THEN
       --  Update AD_PInstance
       DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
@@ -118,6 +118,7 @@
   RETURN;
 END C_Invoice_Cancel
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_INVOICE_CREATE.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_INVOICE_CREATE.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -4,7 +4,7 @@
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_Order_ID" type="NUMERIC" mode="in" default="NULL"/>
       <parameter name="p_Invoice_ID" type="NUMERIC" mode="out"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   * Version 2.5.0 ("License"); You may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
@@ -13,7 +13,7 @@
   * "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  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -68,7 +68,7 @@
     CURSOR Cur_OrderLine (Order_ID NUMBER) IS
       SELECT *
       FROM C_ORDERLINE l
-      WHERE QtyOrdered&lt;&gt;QtyInvoiced
+      WHERE QtyOrdered<>QtyInvoiced
         AND C_Order_ID=Order_ID
       ORDER BY Line  FOR UPDATE;
       ptr_ol Cur_OrderLine%ROWTYPE;
@@ -121,8 +121,8 @@
           WHERE AD_PROCESS_ID IN
             (SELECT AD_PROCESS_ID FROM AD_PINSTANCE WHERE AD_PInstance_ID=p_PInstance_ID)
             AND IsProcessing='Y'
-            AND AD_PInstance_ID&lt;&gt;p_PInstance_ID;
-          IF(v_count&gt;0) THEN
+            AND AD_PInstance_ID<>p_PInstance_ID;
+          IF(v_count>0) THEN
             RAISE_APPLICATION_ERROR(-20000, '@SerialProcessStillRunning@') ;
           END IF;
           --  Update AD_PInstance
@@ -169,7 +169,7 @@
             END IF;
           END LOOP; -- Get Parameter
         ELSE
-          DBMS_OUTPUT.PUT_LINE('--&lt;&lt;C_Invoive_Create&gt;&gt;') ;
+          DBMS_OUTPUT.PUT_LINE('--<<C_Invoive_Create>>') ;
           v_C_Order_ID:=p_Order_ID;
           v_DateInvoiced_aux:=NULL;
           v_InvoiceToDate:=NULL;
@@ -191,11 +191,11 @@
               OR(v_C_Order_ID IS NULL AND v_Selection = 'N'
               AND o.DocStatus IN('CO', 'CL')
               AND IsSOTrx='Y'  -- not for InvoiceSchedule
-              AND InvoiceRule&lt;&gt;'S'  -- of all or a specific business partner / organization
+              AND InvoiceRule<>'S'  -- of all or a specific business partner / organization
               AND(v_BPartner_ID IS NULL
               OR C_BPartner_ID=v_BPartner_ID)
               AND(v_InvoiceToDate IS NULL
-              OR DateOrdered&lt;TRUNC(v_InvoiceToDate) +1)
+              OR DateOrdered<TRUNC(v_InvoiceToDate) +1)
               AND(v_AD_Org_ID IS NULL
               OR AD_Org_ID=v_AD_Org_ID)) -- where there is something to invoice
               OR (v_Selection = 'Y'
@@ -208,7 +208,7 @@
               (SELECT *
               FROM C_ORDERLINE l
               WHERE o.C_Order_ID=l.C_Order_ID
-                AND l.QtyOrdered&lt;&gt;l.QtyInvoiced
+                AND l.QtyOrdered<>l.QtyInvoiced
               )
             ORDER BY PriorityRule,
               C_BPartner_ID,
@@ -216,7 +216,7 @@
             )
           LOOP
             DBMS_OUTPUT.PUT_LINE('Order ' || Cur_Order.DocumentNo || ', ID=' || Cur_Order.C_Order_ID) ;
-            -- Parameter Order Date =&gt; Invoice Date, Accounting Date
+            -- Parameter Order Date => Invoice Date, Accounting Date
             v_DateInvoiced:=v_DateInvoiced_aux;
             IF(v_DateInvoiced IS NULL) THEN
               SELECT MAX(s.movementDate)
@@ -281,8 +281,8 @@
                 INTO v_NoRecords
                 FROM C_ORDERLINE
                 WHERE C_Order_ID=Cur_Order.C_Order_ID
-                  AND qtyOrdered&lt;&gt;qtyDelivered;
-                IF(v_NoRecords&gt;0) THEN
+                  AND qtyOrdered<>qtyDelivered;
+                IF(v_NoRecords>0) THEN
                   DBMS_OUTPUT.PUT_LINE('Order not completely delivered') ;
                   Next_Order:=TRUE;
                 END IF;
@@ -346,7 +346,7 @@
             ELSIF(Cur_Order.InvoiceRule='N') THEN
               DBMS_OUTPUT.PUT_LINE('Invoice Rule: Do not invoice') ;
               Next_Order:=TRUE;
-              -- (S)chedule after Delivery -&gt; Invoice Schedule (ignore here)
+              -- (S)chedule after Delivery -> Invoice Schedule (ignore here)
             ELSE
               Next_Order:=TRUE;
             END IF;
@@ -507,7 +507,7 @@
                       )
                       ;
                   END IF;--Next_O_Line
-                  --&lt;&lt;Next_O_Line&gt;&gt;
+                  --<<Next_O_Line>>
                   Next_O_Line:=FALSE;
                   v_ResultStr:='Fetching_OrderLine(*)';
                   FETCH Cur_OrderLine INTO ptr_ol;
@@ -555,7 +555,7 @@
                       )
                       ;
                   END IF;--Next_S_Line
-                  --&lt;&lt;Next_S_Line&gt;&gt;
+                  --<<Next_S_Line>>
                   Next_S_Line:=FALSE;
                   v_ResultStr:='Fetching_ShipmentLine(*)';
                   FETCH Cur_InOutLine INTO ptr_sl;
@@ -576,7 +576,7 @@
         	  END IF;
 			  --Finished added by P.Sarobe
             END IF;--Next_Order
-            --&lt;&lt;Next_Order&gt;&gt;
+            --<<Next_Order>>
             Next_Order:=FALSE;
             v_ResultStr:='ClosingLine';
             IF(Cur_OrderLine_ISOPEN) THEN
@@ -710,18 +710,18 @@
                 AND o.DocStatus IN('CO', 'CL')
                 AND o.IsSOTrx='Y'  -- completed orders
                 AND sh.DocStatus IN('CO', 'CL') -- we need to invoice - and not invoiced
-                AND ol.QtyOrdered&lt;&gt;ol.QtyInvoiced
-                AND sl.IsInvoiced&lt;&gt;'Y'  --  just invoice scheduled or after delivery orders (invoiceRule Scheduled or after delivery). (O)rder completely delivered pending!!!
+                AND ol.QtyOrdered<>ol.QtyInvoiced
+                AND sl.IsInvoiced<>'Y'  --  just invoice scheduled or after delivery orders (invoiceRule Scheduled or after delivery). (O)rder completely delivered pending!!!
                 AND o.InvoiceRule IN('S', 'D') --  not invoice logistic inouts
                 AND(sh.IsLogistic='N'
                 OR sh.IsLogistic IS NULL) --  enforce limitDate to invoice
                 AND(v_InvoiceToDate IS NULL
-                OR TRUNC(o.DateOrdered)&lt;=v_InvoiceToDate) -- Selection
+                OR TRUNC(o.DateOrdered)<=v_InvoiceToDate) -- Selection
                 AND((v_Selection='Y'
                 AND o.IsSelected='Y') -- or scheduled
-                OR(v_Selection&lt;&gt;'Y'
+                OR(v_Selection<>'Y'
                 AND(si.DateLimit IS NULL
-                OR TRUNC(o.DateOrdered)&lt;=si.DateLimit)) )
+                OR TRUNC(o.DateOrdered)<=si.DateLimit)) )
               ORDER BY sh.C_BPartner_ID, (
                 CASE TO_CHAR(SUBSTR(RPAD(bp.InvoiceGrouping, 15, '0'), 1, 1))
                   WHEN '0'
@@ -821,7 +821,7 @@
               -- Invoice Date from Parameter                  -- or Order
               v_DateInvoiced:=COALESCE(v_DateInvoiced_aux, COALESCE(v_DateOrdered, Now())) ; -- si.DateOrdered);
               --  Summary Invoice only if BP has Schedule setup and selected in invoice
-              IF(NOT(Cur_InvoiceSchedule.C_InvoiceSchedule_ID IS NOT NULL AND Cur_InvoiceSchedule.InvoiceRule='S') AND v_InOut_ID&lt;&gt;Cur_InvoiceSchedule.M_InOut_ID) THEN -- and new document
+              IF(NOT(Cur_InvoiceSchedule.C_InvoiceSchedule_ID IS NOT NULL AND Cur_InvoiceSchedule.InvoiceRule='S') AND v_InOut_ID<>Cur_InvoiceSchedule.M_InOut_ID) THEN -- and new document
                 v_Partner_ID:=-2; -- indicate BP change to force new invoice
               END IF;
               -- BPartner changed - New Invoice
@@ -842,8 +842,8 @@
               14.-User dimension 1 (User1_ID)
               15.-User dimension 2 (User2_ID)
               */
-              IF((v_Partner_ID&lt;&gt;Cur_InvoiceSchedule.C_BPartner_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 1, 1)='1' AND v_gOrg_ID&lt;&gt;Cur_InvoiceSchedule.AD_Org_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 2, 1)='1' AND v_gOrder_ID&lt;&gt;Cur_InvoiceSchedule.C_Order_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 3, 1)='1' AND v_gInOut_ID&lt;&gt;Cur_InvoiceSchedule.M_InOut_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 4, 1)='1' AND v_gBillTo_ID&lt;&gt;Cur_InvoiceSchedule.BillTo_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 5, 1)='1' AND v_gBPartner_Location_ID&lt;&gt;Cur_InvoiceSchedule.C_BPartner_Location_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 6, 1)='1' AND v_gSalesRep_ID&lt;&gt;Cur_InvoiceSchedule.SalesRep_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 7, 1)='1' AND v_gPaymentRule&lt;&gt;Cur_InvoiceSchedule.PaymentRule) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 8, 1)='1' AND v_gPaymentTerm_ID&lt;&gt;Cur_InvoiceSchedule.C_PaymentTerm_ID) OR(SUBSTR(
-                Cur_InvoiceSchedule.InvoiceGrouping, 9, 1)='1' AND v_gCurrency_ID&lt;&gt;Cur_InvoiceSchedule.C_Currency_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 10, 1)='1' AND v_gCampaign_ID&lt;&gt;Cur_InvoiceSchedule.C_Campaign_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 11, 1)='1' AND v_gProject_ID&lt;&gt;Cur_InvoiceSchedule.C_Project_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 12, 1)='1' AND v_gActivitiy_ID&lt;&gt;Cur_InvoiceSchedule.C_Activity_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 13, 1)='1' AND v_gOrgTrx_ID&lt;&gt;Cur_InvoiceSchedule.AD_OrgTrx_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 14, 1)='1' AND v_gUser1_ID&lt;&gt;Cur_InvoiceSchedule.User1_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 15, 1)='1' AND v_gUser2_ID&lt;&gt;Cur_InvoiceSchedule.User2_ID)) THEN
+              IF((v_Partner_ID<>Cur_InvoiceSchedule.C_BPartner_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 1, 1)='1' AND v_gOrg_ID<>Cur_InvoiceSchedule.AD_Org_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 2, 1)='1' AND v_gOrder_ID<>Cur_InvoiceSchedule.C_Order_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 3, 1)='1' AND v_gInOut_ID<>Cur_InvoiceSchedule.M_InOut_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 4, 1)='1' AND v_gBillTo_ID<>Cur_InvoiceSchedule.BillTo_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 5, 1)='1' AND v_gBPartner_Location_ID<>Cur_InvoiceSchedule.C_BPartner_Location_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 6, 1)='1' AND v_gSalesRep_ID<>Cur_InvoiceSchedule.SalesRep_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 7, 1)='1' AND v_gPaymentRule<>Cur_InvoiceSchedule.PaymentRule) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 8, 1)='1' AND v_gPaymentTerm_ID<>Cur_InvoiceSchedule.C_PaymentTerm_ID) OR(SUBSTR(
+                Cur_InvoiceSchedule.InvoiceGrouping, 9, 1)='1' AND v_gCurrency_ID<>Cur_InvoiceSchedule.C_Currency_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 10, 1)='1' AND v_gCampaign_ID<>Cur_InvoiceSchedule.C_Campaign_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 11, 1)='1' AND v_gProject_ID<>Cur_InvoiceSchedule.C_Project_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 12, 1)='1' AND v_gActivitiy_ID<>Cur_InvoiceSchedule.C_Activity_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 13, 1)='1' AND v_gOrgTrx_ID<>Cur_InvoiceSchedule.AD_OrgTrx_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 14, 1)='1' AND v_gUser1_ID<>Cur_InvoiceSchedule.User1_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 15, 1)='1' AND v_gUser2_ID<>Cur_InvoiceSchedule.User2_ID)) THEN
                 v_Partner_ID:=Cur_InvoiceSchedule.C_BPartner_ID;
                 v_gOrg_ID:=Cur_InvoiceSchedule.AD_Org_ID;
                 v_gOrder_ID:=Cur_InvoiceSchedule.C_Order_ID;
@@ -868,7 +868,7 @@
                   v_description:=NULL;
                 END IF;
                 -- Post it, if not first time
-                IF(p_Invoice_ID&lt;&gt;-1) THEN
+                IF(p_Invoice_ID<>-1) THEN
                   UPDATE C_INVOICE
                     SET DateInvoiced=v_DateInvoiced,
                     DateAcct=v_DateInvoiced
@@ -977,7 +977,7 @@
               END IF;--FINISH_PROCESS
               IF(NOT FINISH_PROCESS) THEN
                 -- New Shipment
-                IF(Cur_InvoiceSchedule.M_InOut_ID&lt;&gt;v_InOut_ID) THEN
+                IF(Cur_InvoiceSchedule.M_InOut_ID<>v_InOut_ID) THEN
                   v_InOut_ID:=Cur_InvoiceSchedule.M_InOut_ID;
                   -- Get Reference Info
          SELECT PrintName
@@ -1050,7 +1050,7 @@
             END LOOP; -- Invoice Schedule
             IF(NOT FINISH_PROCESS) THEN
               -- Post last invoice, if exists
-              IF(p_Invoice_ID&lt;&gt;-1) THEN
+              IF(p_Invoice_ID<>-1) THEN
                 v_DateInvoiced:=COALESCE(v_DateInvoiced_aux, COALESCE(v_DateOrdered, Now())) ;
                 UPDATE C_INVOICE
                   SET DateInvoiced=v_DateInvoiced,
@@ -1061,14 +1061,14 @@
             END IF;--FINISH_PROCESS
           END; -- Block
         END IF; -- PInstance not null
-        --&lt;&lt;FINISH_PROCESS&gt;&gt;
+        --<<FINISH_PROCESS>>
         v_Message:='@Created@: ' || v_NoRecords||v_Message;
         IF(p_PInstance_ID IS NOT NULL) THEN
           --  Update AD_PInstance
           DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
           Ad_Update_Pinstance(p_PInstance_ID, NULL, 'N', 1, v_Message) ;
         ELSE
-          DBMS_OUTPUT.PUT_LINE('--&lt;&lt;C_Invoive_Create finished&gt;&gt; ' || v_Message) ;
+          DBMS_OUTPUT.PUT_LINE('--<<C_Invoive_Create finished>> ' || v_Message) ;
         END IF;
         RETURN;
       END; --BODY
@@ -1104,6 +1104,7 @@
       RETURN;
 END C_Invoice_Create
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_INVOICE_CREATE0.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_INVOICE_CREATE0.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION C_INVOICE_CREATE0">
     <function name="C_INVOICE_CREATE0" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   * Version 2.5.0 ("License"); You may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
@@ -11,7 +11,7 @@
   * "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  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -29,6 +29,7 @@
 BEGIN
   C_Invoice_Create(p_PInstance_ID, NULL, v_Dummy) ;
 END C_Invoice_Create0
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_INVOICE_CREATERECEIPT.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_INVOICE_CREATERECEIPT.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION C_INVOICE_CREATERECEIPT">
     <function name="C_INVOICE_CREATERECEIPT" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   * Version 2.5.0 ("License"); You may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
@@ -11,7 +11,7 @@
   * "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  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -105,7 +105,7 @@
         RAISE_APPLICATION_ERROR(-20000, '@InOutCreateFailed@');
       END IF;
     END IF; --FINISH_PROCESS
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
     AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'N', 1, v_Message) ;
@@ -119,6 +119,7 @@
   AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'N', 0, v_ResultStr) ;
   RETURN;
 END C_Invoice_CreateReceipt
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_INVOICE_DISCOUNT_OLD.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_INVOICE_DISCOUNT_OLD.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -3,7 +3,7 @@
     <function name="C_INVOICE_DISCOUNT_OLD" type="NUMERIC">
       <parameter name="p_C_Invoice_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_PayDate" type="TIMESTAMP" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -61,6 +61,7 @@
 WHEN OTHERS THEN
   RETURN NULL;
 END C_Invoice_Discount_Old
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_INVOICE_PERCENTAJE_PAID.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_INVOICE_PERCENTAJE_PAID.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION C_INVOICE_PERCENTAJE_PAID">
     <function name="C_INVOICE_PERCENTAJE_PAID" type="NUMERIC">
       <parameter name="p_Invoice_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -31,6 +31,7 @@
     AND I.C_INVOICE_ID = p_Invoice_ID;
   RETURN ROUND(v_percentaje,4);
 END C_INVOICE_PERCENTAJE_PAID
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_INVOICE_POST.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_INVOICE_POST.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -3,7 +3,7 @@
     <function name="C_INVOICE_POST" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_Invoice_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   * Version 2.5.0 ("License"); You may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
@@ -12,7 +12,7 @@
   * "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  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -154,7 +154,7 @@
       END LOOP; -- Get Parameter
       DBMS_OUTPUT.PUT_LINE('  v_Record_ID=' || v_Record_ID) ;
     ELSE
-      DBMS_OUTPUT.PUT_LINE('--&lt;&lt;C_Invoive_Post&gt;&gt;') ;
+      DBMS_OUTPUT.PUT_LINE('--<<C_Invoive_Post>>') ;
       v_Record_ID:=p_Invoice_ID;
     END IF;
   BEGIN --BODY
@@ -174,7 +174,7 @@
      SELECT SUM(Amt) INTO v_acctAmount
   FROM C_INVOICELINE_ACCTDIMENSION
   WHERE C_InvoiceLine_ID = Cur_line.C_InvoiceLine_ID;
-  IF (v_acctAmount &lt;&gt; Cur_line.LinenetAmt) THEN
+  IF (v_acctAmount <> Cur_line.LinenetAmt) THEN
      v_Message:='@QuantitiesNotMatch@';
           RAISE_APPLICATION_ERROR(-20000, '@QuantitiesNotMatch@') ;
   END IF;
@@ -242,7 +242,7 @@
           INTO v_Aux
           FROM C_DEBT_PAYMENT
         WHERE C_Invoice_ID = v_Record_ID;
-        IF V_Aux&gt;0 THEN
+        IF V_Aux>0 THEN
       RAISE_APPLICATION_ERROR(-20000, '@InvoiceWithManualDP@');
         ELSE
           -- Reset Lines to 0
@@ -289,7 +289,7 @@
          C_DOCTYPE
    WHERE C_DOCTYPE.DocBaseType IN ('ARI', 'API','ARC','APC')
     AND C_DOCTYPE.IsSOTrx=C.ISSOTRX
-    AND Ad_Isorgincluded(C.AD_Org_ID,C_DOCTYPE.AD_Org_ID, C.AD_Client_ID) &lt;&gt; -1
+    AND Ad_Isorgincluded(C.AD_Org_ID,C_DOCTYPE.AD_Org_ID, C.AD_Client_ID) <> -1
     AND C.C_DOCTYPETARGET_ID = C_DOCTYPE.C_DOCTYPE_ID
     AND C.C_INVOICE_ID = V_RECORD_ID;
    IF v_Count=0 THEN
@@ -411,7 +411,7 @@
           -- Close Invoice
           UPDATE C_INVOICE
             SET DocStatus='RE', -- it IS reversed
-            Description=COALESCE(TO_CHAR(Description), '') || ' (*R* -&gt; ' || v_RDocumentNo || ')',
+            Description=COALESCE(TO_CHAR(Description), '') || ' (*R* -> ' || v_RDocumentNo || ')',
             DocAction='--',
             Processed='Y',
             Updated=Now()
@@ -428,7 +428,7 @@
           SELECT COUNT(*)
           INTO v_count
           FROM C_DEBT_PAYMENT dp
-          WHERE C_Debt_Payment_Status(dp.C_Settlement_Cancel_ID, dp.Cancel_Processed, dp.Generate_Processed, dp.IsPaid, dp.IsValid, dp.C_CashLine_ID, dp.C_BankStatementLine_ID)&lt;&gt;'P'
+          WHERE C_Debt_Payment_Status(dp.C_Settlement_Cancel_ID, dp.Cancel_Processed, dp.Generate_Processed, dp.IsPaid, dp.IsValid, dp.C_CashLine_ID, dp.C_BankStatementLine_ID)<>'P'
             AND(dp.C_Invoice_ID=v_Record_ID
             OR dp.C_Invoice_ID=v_RInvoice_ID) ;
           -- To cancel, the sum of amounts should be 0
@@ -500,7 +500,7 @@
         * Modified by Jon Alegria
         */
         IF(v_DocAction='RE') THEN
-          IF(v_DocStatus&lt;&gt;'CO') THEN
+          IF(v_DocStatus<>'CO') THEN
             RAISE_APPLICATION_ERROR(-20000, '@NotCompletedInvoice@');
           END IF;
           IF(NOT END_PROCESSING) THEN
@@ -513,9 +513,9 @@
             INTO v_RECount, v_Debtpayment_ID
             FROM C_DEBT_PAYMENT
             WHERE C_DEBT_PAYMENT.C_Invoice_ID=v_Record_ID
-            AND C_Debt_Payment_Status(C_Settlement_Cancel_ID, Cancel_Processed, C_DEBT_PAYMENT.Generate_Processed, IsPaid, IsValid, C_Cashline_ID, C_BankstatementLine_ID)&lt;&gt;'P'
+            AND C_Debt_Payment_Status(C_Settlement_Cancel_ID, Cancel_Processed, C_DEBT_PAYMENT.Generate_Processed, IsPaid, IsValid, C_Cashline_ID, C_BankstatementLine_ID)<>'P'
             AND C_ORDER_ID IS NULL;
-            IF(v_RECount&lt;&gt;0) THEN
+            IF(v_RECount<>0) THEN
               --Added by P.Sarobe. New messages
           SELECT c_Bankstatementline_Id, c_cashline_id, c_settlement_cancel_id, ispaid, cancel_processed
           INTO v_Bankstatementline_ID, v_CashLine_ID, v_Settlement_Cancel_ID, v_ispaid, v_Cancel_Processed
@@ -566,7 +566,7 @@
             SELECT MIN(DateAcct)
             INTO v_FirstSales
             FROM C_INVOICE
-            WHERE C_Invoice_ID&lt;&gt;v_Record_ID
+            WHERE C_Invoice_ID<>v_Record_ID
               AND C_BPartner_ID=v_BPartner_ID;
             UPDATE C_BPARTNER  SET FirstSale=v_FirstSales  WHERE C_BPartner_ID=v_BPartner_ID;
             -- Undo Last contact
@@ -575,7 +575,7 @@
                 DocumentNo,
                 Ad_User_ID
               FROM C_INVOICE
-              WHERE C_Invoice_ID&lt;&gt;v_Record_ID
+              WHERE C_Invoice_ID<>v_Record_ID
                 AND Ad_User_ID=v_BPartner_User_ID
               ORDER BY Updated DESC
               )
@@ -607,7 +607,7 @@
                     C_INVOICELINE
                   WHERE C_INVOICE.C_Invoice_ID=C_INVOICELINE.C_INVOICE_ID
                     AND C_INVOICELINE.C_ORDERLINE_ID=Cur_ReactivateInvoiceLine.C_ORDERLINE_ID
-                    AND C_INVOICELINE.C_InvoiceLine_ID&lt;&gt;Cur_ReactivateInvoiceLine.C_InvoiceLine_ID;
+                    AND C_INVOICELINE.C_InvoiceLine_ID<>Cur_ReactivateInvoiceLine.C_InvoiceLine_ID;
                   UPDATE C_ORDERLINE
                     SET QtyInvoiced=QtyInvoiced - Cur_ReactivateInvoiceLine.QtyInvoiced,
                     DateInvoiced=v_REDateInvoiced
@@ -620,7 +620,7 @@
                     M_INOUTLINE ml
                   WHERE M.M_InOut_ID=ml.M_InOut_ID
                     AND ml.M_InOutLine_ID=Cur_ReactivateInvoiceLine.M_InOutLine_ID;
-                  IF(v_REInOutStatus&lt;&gt;'RE') THEN
+                  IF(v_REInOutStatus<>'RE') THEN
                     SELECT COALESCE(SUM(C_INVOICELINE.QTYINVOICED), 0)
                     INTO v_REtotalQtyInvoiced
                     FROM C_INVOICELINE,
@@ -707,11 +707,11 @@
           WHERE c.C_BPARTNER_ID=bp.C_BPARTNER_ID
             AND Ad_Isorgincluded(c.AD_ORG_ID, bp.AD_ORG_ID, bp.AD_CLIENT_ID)=-1
             AND c.C_Invoice_ID=v_Record_ID;
-          IF v_count&gt;0 THEN
+          IF v_count>0 THEN
             RAISE_APPLICATION_ERROR(-20000, '@NotCorrectOrgBpartnerInvoice@') ;
           END IF;
           IF(NOT FINISH_PROCESS) THEN
-            WHILE(v_DocType_ID&lt;&gt;v_DocTypeTarget_ID)
+            WHILE(v_DocType_ID<>v_DocTypeTarget_ID)
             LOOP
             BEGIN
               v_ResultStr:='UpdateDocType';
@@ -780,7 +780,7 @@
               FROM M_PRICELIST_VERSION v,
                 C_INVOICE o
               WHERE v.M_PriceList_ID=o.M_PriceList_ID
-                AND v.ValidFrom&lt;=o.DateOrdered
+                AND v.ValidFrom<=o.DateOrdered
                 AND v.IsActive='Y'
                 AND o.C_Invoice_ID=v_Record_ID
               ORDER BY v.ValidFrom DESC
@@ -938,7 +938,7 @@
               SUM(C_INVOICELINE.LINENETAMT) AS LINENETAMT
             FROM C_INVOICELINE
             WHERE C_INVOICE_ID=v_Record_ID
-              AND C_INVOICELINE.LINENETAMT&lt;&gt;0
+              AND C_INVOICELINE.LINENETAMT<>0
               AND C_INVOICE_DISCOUNT_ID IS NULL
             GROUP BY C_TAX_ID
             )
@@ -1111,13 +1111,13 @@
         UPDATE C_INVOICELINE
           SET AD_Client_ID=v_Client_ID
         WHERE C_Invoice_ID=v_Record_ID
-          AND AD_Client_ID&lt;&gt;v_Client_ID;
+          AND AD_Client_ID<>v_Client_ID;
         v_ResultStr:='SyncOwnershipOrg';
         UPDATE C_INVOICELINE
           SET AD_Org_ID=v_Org_ID
         WHERE C_Invoice_ID=v_Record_ID
           AND C_Charge_ID IS NULL -- sync for products
-          AND AD_Org_ID&lt;&gt;v_Org_ID;
+          AND AD_Org_ID<>v_Org_ID;
       END IF;--FINISH_PROCESS
       IF(NOT FINISH_PROCESS AND NOT END_PROCESSING) THEN
         /**************************************************************************
@@ -1132,8 +1132,8 @@
           FROM C_DOCTYPE
           WHERE C_DocType_ID=v_DocType_ID;
           DBMS_OUTPUT.PUT_LINE('IsApproved=' || v_IsApproved) ;
-          IF(v_IsApproved&lt;&gt;'N') THEN -- Approval needed
-            IF(v_DocAction&lt;&gt;'AP') THEN
+          IF(v_IsApproved<>'N') THEN -- Approval needed
+            IF(v_DocAction<>'AP') THEN
               UPDATE C_INVOICE  SET DocStatus='NA'  WHERE C_Invoice_ID=v_Record_ID;
               v_Message:='NotApproved';
               DBMS_OUTPUT.PUT_LINE('Approval needed') ;
@@ -1203,7 +1203,7 @@
             LOOP
               -- The min qty. Modified by Ismael Ciordia
               --v_Qty := Cur_ILines_Receipt.MovementQty;
-              --IF (ABS(Cur_ILines_Receipt.MovementQty) &gt; ABS(Cur_ILines_Receipt.QtyInvoiced)) THEN
+              --IF (ABS(Cur_ILines_Receipt.MovementQty) > ABS(Cur_ILines_Receipt.QtyInvoiced)) THEN
               v_Qty:=Cur_ILines_Receipt.QtyInvoiced;
               --END IF;
               Ad_Sequence_Next('M_MatchInv', Cur_ILines_Receipt.AD_Org_ID, v_MatchInv_ID) ;
@@ -1249,7 +1249,7 @@
             LOOP
               -- The min qty. Modified by Ismael Ciordia
               --v_Qty := Cur_ILines_PO.QtyOrdered;
-              --IF (ABS(Cur_ILines_PO.QtyOrdered) &gt; ABS(Cur_ILines_PO.QtyInvoiced)) THEN
+              --IF (ABS(Cur_ILines_PO.QtyOrdered) > ABS(Cur_ILines_PO.QtyInvoiced)) THEN
               v_Qty:=Cur_ILines_PO.QtyInvoiced;
               --END IF;
               Ad_Sequence_Next('M_MatchPO', Cur_ILines_PO.AD_Org_ID, v_MatchPO_ID) ;
@@ -1304,7 +1304,7 @@
                   M_INOUTLINE ml
                 WHERE M.M_InOut_ID=ml.M_InOut_ID
                   AND ml.M_InOutLine_ID=CurLines.M_InOutLine_ID;
-                IF(v_inOutStatus&lt;&gt;'RE') THEN
+                IF(v_inOutStatus<>'RE') THEN
                   SELECT COALESCE(SUM(C_INVOICELINE.QTYINVOICED), 0)
                   INTO v_totalQtyInvoiced
                   FROM C_INVOICELINE,
@@ -1380,8 +1380,8 @@
           INTO v_totalCash
           FROM C_DEBT_PAYMENT_V dp
           WHERE C_INVOICE_ID=v_Record_ID;
-          --Insert C_Debt_Payment if GrandTotal - v_totalCash &lt;&gt; 0;
-          IF(v_GrandTotal&lt;&gt;v_totalCash) THEN
+          --Insert C_Debt_Payment if GrandTotal - v_totalCash <> 0;
+          IF(v_GrandTotal<>v_totalCash) THEN
             DECLARE
               CUR_PAYMENTS RECORD;
               v_plannedDate DATE;
@@ -1615,7 +1615,7 @@
                 END IF; -- v_cashBook IS NOT NULL
               END LOOP;
             END;
-          END IF; -- v_GrandTotal &lt;&gt; v_totalCash
+          END IF; -- v_GrandTotal <> v_totalCash
         END;
         IF(NOT FINISH_PROCESS) THEN
           C_Bp_Socreditused_Refresh(v_BPartner_ID) ;
@@ -1636,7 +1636,7 @@
       END IF;--FINISH_PROCESS
       IF(NOT FINISH_PROCESS) THEN
         -- End Processing --------------------------------------------------------
-        --&lt;&lt;END_PROCESSING&gt;&gt;
+        --<<END_PROCESSING>>
         v_ResultStr:='UnLockingInvoice';
         UPDATE C_INVOICE
           SET Processing='N',
@@ -1647,13 +1647,13 @@
         -- Commented by cromero 19102006   COMMIT;
         -- Commented by cromero 19102006 END IF;
       END IF;--FINISH_PROCESS
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     IF(p_PInstance_ID IS NOT NULL) THEN
       --  Update AD_PInstance
       DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished - ' || v_Message) ;
       Ad_Update_Pinstance(p_PInstance_ID, v_UpdatedBy, 'N', v_Result, v_Message) ;
     ELSE
-      DBMS_OUTPUT.PUT_LINE('--&lt;&lt;C_Invoive_Post finished&gt;&gt; ' || v_Message) ;
+      DBMS_OUTPUT.PUT_LINE('--<<C_Invoive_Post finished>> ' || v_Message) ;
     END IF;
     RETURN;
   END; --BODY
@@ -1688,6 +1688,7 @@
   END IF;
   -- Commented by cromero 19102006 RETURN;
 END C_Invoice_Post
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_INVOICE_POST0.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_INVOICE_POST0.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION C_INVOICE_POST0">
     <function name="C_INVOICE_POST0" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   * Version 2.5.0 ("License"); You may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
@@ -11,7 +11,7 @@
   * "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  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -27,6 +27,7 @@
 BEGIN
   C_Invoice_Post(p_PInstance_ID, NULL) ;
 END C_Invoice_Post0
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_LOCATION_DESCRIPTION.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_LOCATION_DESCRIPTION.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION C_LOCATION_DESCRIPTION">
     <function name="C_LOCATION_DESCRIPTION" type="NVARCHAR">
       <parameter name="p_C_Location_ID" type="NUMERIC"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -57,6 +57,7 @@
   WHERE L.C_LOCATION_ID=p_C_Location_ID;
   RETURN v_description;
 END C_Location_Description
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_LOCATION_IDENTIFIER.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_LOCATION_IDENTIFIER.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION C_LOCATION_IDENTIFIER">
     <function name="C_LOCATION_IDENTIFIER" type="NVARCHAR">
       <parameter name="p_C_Location_ID" type="NUMERIC"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -70,6 +70,7 @@
   WHERE L.C_LOCATION_ID = p_C_Location_ID;
   RETURN v_description;
 END C_Location_Identifier
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_LOCATION_NAME.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_LOCATION_NAME.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION C_LOCATION_NAME">
     <function name="C_LOCATION_NAME" type="NVARCHAR">
       <parameter name="p_C_Location_ID" type="NUMERIC"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -28,11 +28,12 @@
   INTO v_name
   FROM C_LOCATION L
   WHERE L.C_LOCATION_ID=p_C_Location_ID;
-  IF(LENGTH(v_name) &gt; 59) THEN
+  IF(LENGTH(v_name) > 59) THEN
     v_name:=SUBSTR(v_name, 1, 56) ||'...';
   END IF;
   RETURN v_name;
 END C_Location_Name
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_ORDER_ACTUALIZE_PRICELIST.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_ORDER_ACTUALIZE_PRICELIST.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION C_ORDER_ACTUALIZE_PRICELIST">
     <function name="C_ORDER_ACTUALIZE_PRICELIST" type="NULL">
       <parameter name="PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -76,8 +76,8 @@
       (SELECT Ad_Client_ID,  C_Order_ID,   C_BPartner_ID,   DateOrdered
       FROM C_ORDER
       WHERE C_ORDER.IsSoTrx='Y'
-        AND DateOrdered&gt;=v_DateFrom
-        AND DateOrdered&lt;v_DateTo
+        AND DateOrdered>=v_DateFrom
+        AND DateOrdered<v_DateTo
         AND C_BPartner_ID=v_BPartner_ID
       )
     LOOP
@@ -114,7 +114,7 @@
        FROM AD_PINSTANCE
        WHERE Ad_Pinstance_ID=v_pinstance;
        DBMS_OUTPUT.PUT_LINE('Reactivating c_order_id: ' || Cur_PEDIDOS.C_Order_ID || ' Result: ' || v_result || ' Message: '|| v_ResultStr) ;
-       IF(v_Result&lt;&gt;0) THEN
+       IF(v_Result<>0) THEN
          SELECT M_PriceList_ID
          INTO v_priceList
          FROM C_BPARTNER
@@ -124,7 +124,7 @@
            FROM M_PRICELIST_VERSION
            WHERE M_PriceList_ID=v_priceList
              AND IsActive='Y'
-             AND ValidFrom&lt;Cur_PEDIDOS.DateOrdered
+             AND ValidFrom<Cur_PEDIDOS.DateOrdered
            ORDER BY ValidFrom DESC
            )
          LOOP
@@ -188,7 +188,7 @@
            END; -- FOR COMMIT
        END IF;
     END LOOP;
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished - ' || v_Message) ;
     Ad_Update_Pinstance(PInstance_ID, NULL, 'N', v_Result, v_ResultStr) ;
@@ -202,6 +202,7 @@
   Ad_Update_Pinstance(PInstance_ID, NULL, 'N', 0, v_ResultStr) ;
   RETURN;
 END C_Order_Actualize_Pricelist
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_ORDER_DRILLDOWN.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_ORDER_DRILLDOWN.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION C_ORDER_DRILLDOWN">
     <function name="C_ORDER_DRILLDOWN" type="NULL">
       <parameter name="PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   * Version 2.5.0 ("License"); You may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
@@ -11,7 +11,7 @@
   * "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  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -145,7 +145,7 @@
             (
               PInstance_ID,
               T_Spool_Seq.NEXTVAL,
-              '&gt; ' || Cur_InOut.NAME || ' ' || Cur_InOut.DocumentNo || ':  @DocStatus@=' || Cur_InOut.DocStatus  || ', @Processed@=' || Cur_InOut.Processed || ', Wh=' || Cur_InOut.M_Warehouse_ID
+              '> ' || Cur_InOut.NAME || ' ' || Cur_InOut.DocumentNo || ':  @DocStatus@=' || Cur_InOut.DocStatus  || ', @Processed@=' || Cur_InOut.Processed || ', Wh=' || Cur_InOut.M_Warehouse_ID
             )
             ;
           -- Shipment Lines
@@ -212,7 +212,7 @@
             (
               PInstance_ID,
               T_Spool_Seq.NEXTVAL,
-              '&gt; ' || Cur_Invoice.NAME || ' ' || Cur_Invoice.DocumentNo || ':  @DocStatus@=' || Cur_Invoice.DocStatus  || ', @Processed@=' || Cur_Invoice.Processed
+              '> ' || Cur_Invoice.NAME || ' ' || Cur_Invoice.DocumentNo || ':  @DocStatus@=' || Cur_Invoice.DocStatus  || ', @Processed@=' || Cur_Invoice.Processed
             )
             ;
           -- Invoice Lines
@@ -246,7 +246,7 @@
         END LOOP; -- Invoices
       END; -- Invoice
     END LOOP; -- Order
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
     AD_UPDATE_PINSTANCE(PInstance_ID, NULL, 'N', 1, v_Message) ;
@@ -259,6 +259,7 @@
     RETURN;
 END C_ORDER_DRILLDOWN
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_ORDER_FACT_RESET.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_ORDER_FACT_RESET.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION C_ORDER_FACT_RESET">
     <function name="C_ORDER_FACT_RESET" type="NULL">
       <parameter name="p_C_Order_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -28,9 +28,9 @@
     SET Posted='N',
     Processing='N'
   WHERE C_Order_ID=p_C_Order_ID
-    AND(Posted&lt;&gt;'N'
+    AND(Posted<>'N'
     OR Posted IS NULL
-    OR Processing&lt;&gt;'N'
+    OR Processing<>'N'
     OR Processing IS NULL) ;
   DELETE FROM Fact_Acct  WHERE AD_Table_ID=v_AD_Table_ID  AND RECORD_ID=p_C_Order_ID;
   -- Commented by cromero 19102006 COMMIT;
@@ -42,6 +42,7 @@
   RETURN;
 END C_Order_Fact_Reset
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_ORDER_POST.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_ORDER_POST.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,14 +2,14 @@
   <database name="FUNCTION C_ORDER_POST">
     <function name="C_ORDER_POST" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/******************************************************************************
+      <body><![CDATA[/******************************************************************************
   * The contents of this file are subject to the   Compiere License  Version 1.1
   * ("License"); You may not use this file except in compliance with the License
   * You may obtain a copy of the License at http://www.compiere.org/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                  Compiere  ERP &amp;  Business Solution
+  * The Original Code is                  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere, Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
   * created by ComPiere are Copyright (C) ComPiere, Inc.;   All Rights Reserved.
@@ -19,6 +19,7 @@
 BEGIN
   C_Order_Post1(p_PInstance_ID, NULL) ;
 END C_Order_Post
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_ORDER_POST1.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_ORDER_POST1.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -3,7 +3,7 @@
     <function name="C_ORDER_POST1" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_Order_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -151,11 +151,11 @@
       /**
       * Waiting on Prepayment  can only be closed
       */
-      IF(v_DocStatus='WP' AND v_DocAction&lt;&gt;'CL') THEN
+      IF(v_DocStatus='WP' AND v_DocAction<>'CL') THEN
         RAISE_APPLICATION_ERROR(-20000, '@WaitingPayment@') ;
       END IF;
     END IF;--FINISH_PROCESS
-    IF (v_DocSubTypeSO='PR' AND v_invoicerule &lt;&gt; 'I') THEN
+    IF (v_DocSubTypeSO='PR' AND v_invoicerule <> 'I') THEN
       RAISE_APPLICATION_ERROR(-20000, '@PrepayMustImmediate@');
     END IF;
     IF(NOT FINISH_PROCESS) THEN
@@ -222,7 +222,7 @@
           IF(v_DocSubTypeSO IN('WI', 'WP', 'WR')) THEN
             -- Cancel existing Deli very + Invoice Documents
             M_Inout_Cancel(NULL, v_Record_ID) ;
-            IF(v_DocSubTypeSO&lt;&gt;'WP') THEN
+            IF(v_DocSubTypeSO<>'WP') THEN
               C_Invoice_Cancel(NULL, v_Record_ID);
             END IF;
           END IF;
@@ -384,7 +384,7 @@
          C_DOCTYPE
    WHERE C_DocType.DocBaseType IN ('SOO', 'POO')
      AND C_DocType.IsSOTrx=C.ISSOTRX
-    AND AD_ISORGINCLUDED(C.AD_Org_ID,C_DocType.AD_Org_ID, C.AD_Client_ID) &lt;&gt; -1
+    AND AD_ISORGINCLUDED(C.AD_Org_ID,C_DocType.AD_Org_ID, C.AD_Client_ID) <> -1
     AND C.C_DOCTYPETARGET_ID = C_DOCTYPE.C_DOCTYPE_ID
     AND C.C_ORDER_ID = v_Record_ID;
    IF v_Count=0 THEN
@@ -410,7 +410,7 @@
             QuantityOrder=QuantityOrder,
             Updated=Now()
           WHERE C_Order_ID=v_Record_ID
-            AND QtyOrdered&lt;&gt;QtyDelivered;
+            AND QtyOrdered<>QtyDelivered;
           -- For Purchase orders, M_MatchPO table used. Notice that only delivered lines(C_Invoiceline_Id is null) using
         ELSE
           UPDATE C_ORDERLINE
@@ -459,7 +459,7 @@
           LineNetAmt=0,
           Updated=Now()
         WHERE C_Order_ID=v_Record_ID
-          AND QtyOrdered&lt;&gt;0;
+          AND QtyOrdered<>0;
       END IF;
     END IF;--FINISH_PROCESS
     IF(NOT FINISH_PROCESS) THEN
@@ -490,7 +490,7 @@
       FROM AD_CLIENTINFO
       WHERE AD_CLIENT_ID=v_Client_ID
         AND CHECKORDERORG='Y';
-      IF v_count&gt;0 THEN
+      IF v_count>0 THEN
         v_ResultStr:='CheckingRestrictions - C_ORDER ORG IS IN C_BPARTNER ORG TREE';
         SELECT COUNT(*)
         INTO v_count
@@ -499,7 +499,7 @@
         WHERE c.C_Order_ID=v_Record_ID
           AND c.C_BPARTNER_ID=bp.C_BPARTNER_ID
           AND Ad_Isorgincluded(c.AD_ORG_ID, bp.AD_ORG_ID, bp.AD_CLIENT_ID)=-1;
-        IF v_count&gt;0 THEN
+        IF v_count>0 THEN
           RAISE_APPLICATION_ERROR(-20000, '@NotCorrectOrgBpartnerOrder@') ;
         END IF;
       END IF;
@@ -512,11 +512,11 @@
         v_DocSubTypeSO_Target CHAR(2) ;
       BEGIN
         v_ResultStr:='ConvertingDocType';
-        IF(v_DocType_ID&lt;&gt;v_DocTypeTarget_ID) THEN
+        IF(v_DocType_ID<>v_DocTypeTarget_ID) THEN
           -- New
           IF(v_DocStatus='DR' OR v_DocType_ID=0) THEN
             -- Update to Target Document Type
-            WHILE(v_DocType_ID&lt;&gt;v_DocTypeTarget_ID)
+            WHILE(v_DocType_ID<>v_DocTypeTarget_ID)
             LOOP
             BEGIN
               v_ResultStr:='UpdateDocType';
@@ -540,7 +540,7 @@
           -- Change Offer to anything, Change InProcess to anything
           IF(v_DocSubTypeSO IN('ON', 'OB') OR v_DocStatus='IP') THEN
             -- Update to Target Document Type
-            WHILE(v_DocType_ID&lt;&gt;v_DocTypeTarget_ID)
+            WHILE(v_DocType_ID<>v_DocTypeTarget_ID)
             LOOP
             BEGIN
               v_ResultStr:='UpdateDocType';
@@ -562,7 +562,7 @@
           RAISE_APPLICATION_ERROR(-20000, '@CannotChangeDocType@') ;
         END IF;
       END IF;
-    END IF; -- C_DocType_ID &lt;&gt; C_DocTypeTarget_ID
+    END IF; -- C_DocType_ID <> C_DocTypeTarget_ID
   END; -- Conversion
 END IF;--FINISH_PROCESS
 IF(NOT FINISH_PROCESS AND NOT END_PROCESSING) THEN
@@ -627,7 +627,7 @@
           FROM M_PRICELIST_VERSION v,
             C_ORDER o
           WHERE v.M_PriceList_ID=o.M_PriceList_ID
-            AND v.ValidFrom&lt;=o.DateOrdered
+            AND v.ValidFrom<=o.DateOrdered
             AND v.IsActive='Y'
             AND o.C_Order_ID=v_Record_ID
           ORDER BY v.ValidFrom DESC
@@ -764,7 +764,7 @@
          AND p.IsStocked='Y' AND p.ProductType='I'
          -- Target Level = 0 if DirectShip='Y' or Binding='N'
          AND (CASE l.DirectShip WHEN 'Y' THEN 0 ELSE (CASE v_IsBinding WHEN 'N' THEN 0 ELSE l.QtyOrdered END)END)
-         -l.QtyReserved-l.QtyDelivered &lt;&gt; 0
+         -l.QtyReserved-l.QtyDelivered <> 0
        FOR UPDATE) LOOP
    -- Qty corrected for SO/PO
    IF (v_DocSubTypeSO IS NOT NULL) THEN
@@ -799,7 +799,7 @@
     WHERE C_OrderLine_ID = Cur_ResLine.C_OrderLine_ID;
    END IF;
    rowcount:=SQL%ROWCOUNT;
-   IF (rowcount &lt;&gt; 1) THEN
+   IF (rowcount <> 1) THEN
        IF (p_PInstance_ID IS NOT NULL) THEN
  ROLLBACK;
      v_ResultStr := 'LockingOrder';
@@ -925,8 +925,8 @@
     SET AD_Client_ID=v_Client_ID,
     AD_Org_ID=v_Org_ID
   WHERE C_Order_ID=v_Record_ID
-    AND(AD_Client_ID&lt;&gt;v_Client_ID
-    OR AD_Org_ID&lt;&gt;v_Org_ID) ;
+    AND(AD_Client_ID<>v_Client_ID
+    OR AD_Org_ID<>v_Org_ID) ;
 END IF;--FINISH_PROCESS
 IF(NOT END_PROCESSING AND NOT FINISH_PROCESS) THEN
   /**************************************************************************
@@ -993,8 +993,8 @@
     FROM C_DOCTYPE
     WHERE C_DocType_ID=v_DocType_ID;
     DBMS_OUTPUT.PUT_LINE('IsApproved=' || v_IsApproved) ;
-    IF(v_IsApproved&lt;&gt;'N') THEN -- Approval needed
-      IF(v_DocAction&lt;&gt;'AP') THEN
+    IF(v_IsApproved<>'N') THEN -- Approval needed
+      IF(v_DocAction<>'AP') THEN
         UPDATE C_ORDER
           SET DocStatus='NA',
           DocAction='AP',
@@ -1029,7 +1029,7 @@
   /**************************************************************************
   * Prepayment Order  Create Invoice
   *************************************************************************/
-  IF(v_DocSubTypeSO='PR' AND v_DocStatus&lt;&gt;'WP') THEN
+  IF(v_DocSubTypeSO='PR' AND v_DocStatus<>'WP') THEN
     DBMS_OUTPUT.PUT_LINE('Create PreInvoice - ' || v_Record_ID) ;
     v_ResultStr:='CreatePreInvoice';
     C_Invoice_Create(NULL, v_Record_ID, Invoice_ID) ;
@@ -1387,7 +1387,7 @@
 END IF;--FINISH_PROCESS
 IF(NOT FINISH_PROCESS) THEN
   -- End Processing --------------------------------------------------------
-  --&lt;&lt;END_PROCESSING&gt;&gt;
+  --<<END_PROCESSING>>
   -- Cloase Order
   IF(v_DocAction='CL') THEN
     UPDATE C_ORDER
@@ -1406,7 +1406,7 @@
     COMMIT;
   END IF;
 END IF;--FINISH_PROCESS
---&lt;&lt;FINISH_PROCESS&gt;&gt;
+--<<FINISH_PROCESS>>
 IF(p_PInstance_ID IS NOT NULL) THEN
   --  Update AD_PInstance
   DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished - ' || v_Message) ;
@@ -1447,6 +1447,7 @@
   END IF;
   RETURN;
 END C_Order_Post1
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_ORDER_PO_CREATE.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_ORDER_PO_CREATE.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION C_ORDER_PO_CREATE">
     <function name="C_ORDER_PO_CREATE" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   * Version 2.5.0 ("License"); You may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
@@ -11,7 +11,7 @@
   * "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  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -235,7 +235,7 @@
                 ON(po.C_BPartner_ID=v.C_BPartner_ID)
               INNER JOIN M_PRICELIST_VERSION plv
                 ON(v.PO_PriceList_ID=plv.M_PriceList_ID
-                AND plv.ValidFrom&lt;sol.DateOrdered)
+                AND plv.ValidFrom<sol.DateOrdered)
               WHERE sol.C_Order_ID=Cur_SO.C_Order_ID
                 AND v.C_BPartner_ID=Cur_SO.C_BPartner_ID
               ORDER BY plv.ValidFrom DESC
@@ -414,7 +414,7 @@
     IF(NOT FINISH_PROCESS) THEN
       v_Message:='@Created@=' || v_Created;
     END IF; --FINISH_PROCESS
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
     AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'N', v_Result, v_Message) ;
@@ -429,6 +429,7 @@
   RETURN;
 END C_ORDER_PO_CREATE
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_ORDER_STATUS.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_ORDER_STATUS.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION C_ORDER_STATUS">
     <function name="C_ORDER_STATUS" type="CHAR">
       <parameter name="p_OrderID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -40,13 +40,13 @@
     INTO v_CountNotDelivered
     FROM C_OrderLine
     WHERE C_ORDER_ID = p_OrderID
-      AND QtyOrdered &lt;&gt; QtyDelivered;
+      AND QtyOrdered <> QtyDelivered;
     --Invoiced
     SELECT COUNT(*)
     INTO v_CountNotInvoiced
     FROM C_OrderLine
     WHERE C_ORDER_ID = p_OrderID
-      AND QtyOrdered &lt;&gt; QtyInvoiced;
+      AND QtyOrdered <> QtyInvoiced;
     --paid
     IF(v_CountNotInvoiced = 0) THEN
       SELECT COUNT(*)
@@ -60,7 +60,7 @@
           AND C_InvoiceLine.C_Invoice_ID = C_Invoice.C_Invoice_ID
           AND C_OrderLine.C_Order_ID = p_OrderID
         )
-        AND grandtotal &lt;&gt;
+        AND grandtotal <>
         (SELECT SUM(C_Currency_Convert(Amount, C_Debt_Payment.C_Currency_ID, C_Invoice.C_Currency_ID, C_Invoice.DateInvoiced, null, null, null))
         FROM C_Debt_Payment
         WHERE C_Invoice_ID = C_Invoice.C_Invoice_ID
@@ -72,7 +72,7 @@
       INTO v_CountNotPaid
       FROM C_Order
       WHERE C_Order_ID = p_OrderID
-        AND grandtotal &lt;&gt;
+        AND grandtotal <>
         (SELECT SUM(C_Currency_Convert(Amount, C_Debt_Payment.C_Currency_ID, C_Order.C_Currency_ID, to_date(now()), null, null, null))
         FROM C_Debt_Payment
         WHERE C_Order_ID = p_OrderID
@@ -80,15 +80,15 @@
         )
         ;
     END IF;
-    IF(v_CountNotDelivered &lt;&gt; 0 AND v_CountNotInvoiced &lt;&gt; 0 AND v_CountNotPaid &lt;&gt; 0) THEN
+    IF(v_CountNotDelivered <> 0 AND v_CountNotInvoiced <> 0 AND v_CountNotPaid <> 0) THEN
       v_Status := '2'; --Pending
-    ELSIF(v_CountNotDelivered &lt;&gt; 0 AND v_CountNotInvoiced &lt;&gt; 0 AND v_CountNotPaid = 0) THEN
+    ELSIF(v_CountNotDelivered <> 0 AND v_CountNotInvoiced <> 0 AND v_CountNotPaid = 0) THEN
       v_Status := '3'; --Paid and not delivered
-    ELSIF(v_CountNotDelivered = 0 AND v_CountNotInvoiced &lt;&gt; 0 AND v_CountNotPaid &lt;&gt; 0) THEN
+    ELSIF(v_CountNotDelivered = 0 AND v_CountNotInvoiced <> 0 AND v_CountNotPaid <> 0) THEN
       v_Status := '4'; --Delivered, not invoiced nor paid
-    ELSIF(v_CountNotDelivered = 0 AND v_CountNotInvoiced = 0 AND v_CountNotPaid &lt;&gt; 0) THEN
+    ELSIF(v_CountNotDelivered = 0 AND v_CountNotInvoiced = 0 AND v_CountNotPaid <> 0) THEN
       v_Status := '5'; --Invoiced not paid
-    ELSIF(v_CountNotDelivered = 0 AND v_CountNotInvoiced &lt;&gt; 0 AND v_CountNotPaid = 0) THEN
+    ELSIF(v_CountNotDelivered = 0 AND v_CountNotInvoiced <> 0 AND v_CountNotPaid = 0) THEN
       v_Status := '6'; --Pending to invoice
     ELSIF(v_CountNotDelivered = 0 AND v_CountNotInvoiced = 0 AND v_CountNotPaid = 0) THEN
       v_Status := '9'; --Finished
@@ -96,6 +96,7 @@
   END IF;
   RETURN v_Status;
 END C_Order_Status
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_PAYMENTDUEDATE.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_PAYMENTDUEDATE.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -11,7 +11,7 @@
       <parameter name="p_netDay" type="CHAR" mode="in"/>
       <parameter name="p_isNextbusinessday" type="CHAR" mode="in"/>
       <parameter name="p_DocDate" type="TIMESTAMP" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -65,13 +65,13 @@
     --First aply offset (days and months)
     v_docDate := p_DocDate + COALESCE(p_netDays, 0) ;
     v_docDate := ADD_MONTHS2(v_docDate, COALESCE(p_fixMonthOffset, 0)) ;
-    IF((v_fixMonthDay2 &lt; TO_NUMBER(TO_CHAR(TRUNC(v_docDate), 'dd'))) AND(v_fixMonthDay3 &gt;= TO_NUMBER(TO_CHAR(TRUNC(v_docDate), 'dd')))) THEN
+    IF((v_fixMonthDay2 < TO_NUMBER(TO_CHAR(TRUNC(v_docDate), 'dd'))) AND(v_fixMonthDay3 >= TO_NUMBER(TO_CHAR(TRUNC(v_docDate), 'dd')))) THEN
       v_FixMonthDay := v_fixMonthDay3;
-    ELSIF((v_fixMonthDay1 &lt; TO_NUMBER(TO_CHAR(TRUNC(v_docDate), 'dd'))) AND(v_fixMonthDay2 &gt;= TO_NUMBER(TO_CHAR(TRUNC(v_docDate), 'dd')))) THEN
+    ELSIF((v_fixMonthDay1 < TO_NUMBER(TO_CHAR(TRUNC(v_docDate), 'dd'))) AND(v_fixMonthDay2 >= TO_NUMBER(TO_CHAR(TRUNC(v_docDate), 'dd')))) THEN
       v_FixMonthDay := v_fixMonthDay2;
     ELSE
       v_FixMonthDay := v_fixMonthDay1;
-      IF(v_FixMonthDay &lt; TO_NUMBER(TO_CHAR(TRUNC(v_docDate), 'dd'))) THEN
+      IF(v_FixMonthDay < TO_NUMBER(TO_CHAR(TRUNC(v_docDate), 'dd'))) THEN
         v_docDate := ADD_MONTHS(v_docDate, 1) ;
       END IF;
     END IF;
@@ -92,6 +92,7 @@
   END IF;
   RETURN COALESCE(v_DueDate, TRUNC(p_DocDate)) ;
 END C_PaymentDueDate
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_PAYMENTTERM_DISCOUNT.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_PAYMENTTERM_DISCOUNT.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -5,7 +5,7 @@
       <parameter name="p_PaymentTerm_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_DocDate" type="TIMESTAMP" mode="in"/>
       <parameter name="p_PayDate" type="TIMESTAMP" mode="in" default="SYSDATE"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * The contents of this file are subject to the Compiere License
 * Version 2.5.0 ("License"); You may not use this file except in
 * compliance with the License. You may obtain a copy of the License at
@@ -14,7 +14,7 @@
 * "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  Compiere  ERP &amp;  Business Solution
+* The Original Code is  Compiere  ERP &  Business Solution
 * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
 Inc.
 * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -76,11 +76,11 @@
         v_Discount2Date := v_Discount2Date+v_Add2Date;
       END IF;
       -- Discount 1
-      IF(v_Discount1Date &gt;= TRUNC(p_PayDate)) THEN
+      IF(v_Discount1Date >= TRUNC(p_PayDate)) THEN
         --   DBMS_OUTPUT.PUT_LINE('Discount 1 ' || TO_CHAR(v_Discount1Date) || ' ' || Cur_PT.Discount);
         Discount := p_Amount * Cur_PT.Discount / 100;
         -- Discount 2
-      ELSIF(v_Discount2Date &gt;= TRUNC(p_PayDate)) THEN
+      ELSIF(v_Discount2Date >= TRUNC(p_PayDate)) THEN
         --   DBMS_OUTPUT.PUT_LINE('Discount 2 ' || TO_CHAR(v_Discount2Date) || ' ' || Cur_PT.Discount2);
         Discount := p_Amount * Cur_PT.Discount2 / 100;
       END IF;
@@ -88,6 +88,7 @@
     --
     RETURN ROUND(COALESCE(Discount, 0), 2) ; -- fixed rounding
 END C_PaymentTerm_Discount
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_PAYMENTTERM_DUEDATE.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_PAYMENTTERM_DUEDATE.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -4,7 +4,7 @@
       <parameter name="p_PaymentTerm_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_DocDate" type="TIMESTAMP" mode="in"/>
       <parameter name="p_BPartner_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -38,6 +38,7 @@
     END LOOP;
     RETURN COALESCE(v_DueDate, TRUNC(p_DocDate)) ;
 END C_PaymentTerm_DueDate
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_PAYMENTTERM_DUEDAYS.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_PAYMENTTERM_DUEDAYS.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -4,7 +4,7 @@
       <parameter name="p_PaymentTerm_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_DocDate" type="TIMESTAMP" mode="in"/>
       <parameter name="p_PayDate" type="TIMESTAMP" mode="in" default="SYSDATE"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * The contents of this file are subject to the Compiere License
 * Version 2.5.0 ("License"); You may not use this file except in
 * compliance with the License. You may obtain a copy of the License at
@@ -13,7 +13,7 @@
 * "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  Compiere  ERP &amp;  Business Solution
+* The Original Code is  Compiere  ERP &  Business Solution
 * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
 Inc.
 * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -35,6 +35,7 @@
 BEGIN
   RETURN TRUNC(p_PayDate) - C_PAYMENTTERM_DUEDATE(p_PaymentTerm_ID, p_DocDate, NULL) ;
 END C_PaymentTerm_DueDays
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_PAYMENTTERM_NOTE.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_PAYMENTTERM_NOTE.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -3,7 +3,7 @@
     <function name="C_PAYMENTTERM_NOTE" type="NVARCHAR">
       <parameter name="p_PaymentTerm_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_TermDate" type="TIMESTAMP" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * The contents of this file are subject to the Compiere License
 * Version 2.5.0 ("License"); You may not use this file except in
 * compliance with the License. You may obtain a copy of the License at
@@ -12,7 +12,7 @@
 * "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  Compiere  ERP &amp;  Business Solution
+* The Original Code is  Compiere  ERP &  Business Solution
 * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
 Inc.
 * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -35,6 +35,7 @@
   WHERE C_PaymentTerm_ID = p_PaymentTerm_ID;
   RETURN v_DocNote;
 END C_PaymentTerm_Note
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_PERIODCONTROL_PROCESS.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_PERIODCONTROL_PROCESS.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION C_PERIODCONTROL_PROCESS">
     <function name="C_PERIODCONTROL_PROCESS" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   * Version 2.5.0 ("License"); You may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
@@ -11,7 +11,7 @@
   * "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  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -70,14 +70,14 @@
         SET PeriodStatus='O',
         PeriodAction='N'
       WHERE C_PeriodControl_ID=v_Record_ID
-        AND PeriodStatus&lt;&gt;'P';
+        AND PeriodStatus<>'P';
       -- Action: Close if not permanently closed
     ELSIF(v_PeriodAction='C') THEN
       UPDATE C_PeriodControl
         SET PeriodStatus='C',
         PeriodAction='N'
       WHERE C_PeriodControl_ID=v_Record_ID
-        AND PeriodStatus&lt;&gt;'P';
+        AND PeriodStatus<>'P';
       -- Action: Permanently Close
     ELSIF(v_PeriodAction='P') THEN
       UPDATE C_PeriodControl
@@ -85,7 +85,7 @@
         PeriodAction='N'
       WHERE C_PeriodControl_ID=v_Record_ID;
     END IF;
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
     AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'N', 1, v_Message) ;
@@ -100,6 +100,7 @@
   RETURN;
 END C_PeriodControl_Process
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_PERIOD_PROCESS.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_PERIOD_PROCESS.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION C_PERIOD_PROCESS">
     <function name="C_PERIOD_PROCESS" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   * Version 2.5.0 ("License"); You may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
@@ -11,7 +11,7 @@
   * "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  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -70,18 +70,18 @@
       UPDATE C_PeriodControl
         SET PeriodStatus='O'
       WHERE C_Period_ID=v_Record_ID
-        AND PeriodStatus&lt;&gt;'P';
+        AND PeriodStatus<>'P';
       -- Action: Close if not permanently closed
     ELSIF(p_PeriodAction='C') THEN
       UPDATE C_PeriodControl
         SET PeriodStatus='C'
       WHERE C_Period_ID=v_Record_ID
-        AND PeriodStatus&lt;&gt;'P';
+        AND PeriodStatus<>'P';
       -- Action: Permanently Close
     ELSIF(p_PeriodAction='P') THEN
       UPDATE C_PeriodControl  SET PeriodStatus='P'  WHERE C_Period_ID=v_Record_ID;
     END IF;
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
     AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'N', 1, v_Message) ;
@@ -96,6 +96,7 @@
   RETURN;
 END C_Period_Process
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_PROJECT_GENERATE.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_PROJECT_GENERATE.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION C_PROJECT_GENERATE">
     <function name="C_PROJECT_GENERATE" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   * Version 2.5.0 ("License"); You may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
@@ -11,7 +11,7 @@
   * "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  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -232,7 +232,7 @@
     IF(NOT FINISH_PROCESS) THEN
       v_Message:='@InvoiceDocumentno@ = ' || v_DocumentNo;
     END IF; --FINISH_PROCESS
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
     Ad_Update_Pinstance(p_PInstance_ID, NULL, 'N', 1, v_Message) ;
@@ -247,6 +247,7 @@
   RETURN;
 END C_Project_Generate
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_PROJECT_WON.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_PROJECT_WON.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION C_PROJECT_WON">
     <function name="C_PROJECT_WON" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -177,7 +177,7 @@
       v_Resultstr:='@Projectclose@';
       v_Message:='@Projectclose@';
     END IF;
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
     AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'N', 1, v_Message) ;
@@ -191,6 +191,7 @@
   RETURN;
 END C_Project_Won
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_REMITTANCE_POST.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_REMITTANCE_POST.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -3,7 +3,7 @@
     <function name="C_REMITTANCE_POST" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_Remittance_ID" type="NUMERIC" mode="in" default="NULL"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -101,7 +101,7 @@
       END LOOP; --  Get Parameter
       DBMS_OUTPUT.PUT_LINE('  Record_ID=' || v_Record_ID) ;
     ELSE
-      DBMS_OUTPUT.PUT_LINE('--&lt;&lt;C_Settlement_Post&gt;&gt;') ;
+      DBMS_OUTPUT.PUT_LINE('--<<C_Settlement_Post>>') ;
       v_Record_ID:=p_Remittance_ID;
     END IF;
   BEGIN --BODY
@@ -393,7 +393,7 @@
           AND isManual='N';
         --Post DPManagement
         C_Dp_Management_Post(NULL, v_DPMId) ;
-        IF v_GeneratedAmt&gt;0 THEN
+        IF v_GeneratedAmt>0 THEN
           v_IsReceipt:='N';
         ELSE
           v_IsReceipt:='Y';
@@ -521,14 +521,14 @@
           ;
       END IF;
     END IF;--FINISH_PROCESS
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     --  Update AD_PInstance
     UPDATE C_REMITTANCE SET Processing = 'N' WHERE C_Remittance_ID = v_Record_ID;
     IF(p_PInstance_ID IS NOT NULL) THEN
       DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
       Ad_Update_Pinstance(p_PInstance_ID, NULL, 'N', v_Result, v_Message) ;
     ELSE
-      DBMS_OUTPUT.PUT_LINE('--&lt;&lt;C_DP_Management_Post finished&gt;&gt; ' || v_Message) ;
+      DBMS_OUTPUT.PUT_LINE('--<<C_DP_Management_Post finished>> ' || v_Message) ;
       IF(v_Result=0) THEN
         RAISE_APPLICATION_ERROR(-20100, v_Message) ;
       END IF;
@@ -566,6 +566,7 @@
   END IF;
   RETURN;
 END C_Remittance_Post
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_SETTLEMENT_POST.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_SETTLEMENT_POST.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -3,7 +3,7 @@
     <function name="C_SETTLEMENT_POST" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_Settlement_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -85,7 +85,7 @@
       END LOOP; --  Get Parameter
       DBMS_OUTPUT.PUT_LINE('  Record_ID=' || v_Record_ID) ;
     ELSE
-      DBMS_OUTPUT.PUT_LINE('--&lt;&lt;C_Settlement_Post&gt;&gt;') ;
+      DBMS_OUTPUT.PUT_LINE('--<<C_Settlement_Post>>') ;
       v_Record_ID:=p_Settlement_ID;
     END IF;
   BEGIN --BODY
@@ -104,7 +104,7 @@
         OR C_CASHLINE_ID IS NOT NULL)
         AND(C_SETTLEMENT_GENERATE_ID=v_Record_ID
         OR C_SETTLEMENT_CANCEL_ID=v_Record_ID) ;
-      IF v_Aux&lt;&gt;0 THEN
+      IF v_Aux<>0 THEN
 	  	 SELECT AD_COLUMN_IDENTIFIER_STD('C_Debt_Payment',TO_CHAR(C_DEBT_PAYMENT.C_Debt_Payment_Id)), C_BANKSTATEMENTLINE_ID, C_CASHLINE_ID
 		 INTO v_column_identifier, v_Bankstatement_ID,v_Cashline_ID
 		 FROM C_DEBT_PAYMENT WHERE C_DEBT_PAYMENT_ID = v_Debt_Payment_ID;
@@ -131,7 +131,7 @@
         FROM C_DEBT_PAYMENT
         WHERE C_SETTLEMENT_CANCEL_ID IS NOT NULL
           AND C_SETTLEMENT_GENERATE_ID=v_Record_ID;
-        IF v_Aux&lt;&gt;0 THEN
+        IF v_Aux<>0 THEN
 		  SELECT documentno, datetrx, AD_COLUMN_IDENTIFIER_STD('C_Debt_Payment', TO_CHAR(C_DEBT_PAYMENT.C_Debt_Payment_Id))
 		  INTO v_documentno_Settlement, v_dateSettlement, v_column_identifier
 		  FROM C_SETTLEMENT, C_DEBT_PAYMENT
@@ -167,7 +167,7 @@
         WHERE POSTED='Y'
           AND C_SETTLEMENT_ID=v_Record_ID;
         --Direct accounting settlement verification is not necessary because it's controlled in the previous restriction
-        IF v_Aux&lt;&gt;0 THEN
+        IF v_Aux<>0 THEN
           RAISE_APPLICATION_ERROR(-20000, '@SettlementDocumentPosted@') ;
         ELSE
           UPDATE C_SETTLEMENT
@@ -218,7 +218,7 @@
         OR c.C_SETTLEMENT_GENERATE_ID=v_Record_ID)
         AND c.C_BPARTNER_ID=bp.C_BPARTNER_ID
         AND Ad_Isorgincluded(c.AD_ORG_ID, bp.AD_ORG_ID, bp.AD_CLIENT_ID)=-1;
-      IF v_Aux&gt;0 THEN
+      IF v_Aux>0 THEN
         RAISE_APPLICATION_ERROR(-20000, '@OrgDebtpayment@'||v_column_identifier||' '||'@OrgdifferentBpartner@') ;
       END IF;
     END IF;--FINISH_PROCESS
@@ -233,7 +233,7 @@
       FROM C_SETTLEMENT S,
         C_DocType
       WHERE C_DocType.DocBaseType IN ('STT','STM')
-   AND AD_ISORGINCLUDED(S.AD_Org_ID,C_DocType.AD_Org_ID, S.AD_Client_ID) &lt;&gt; -1
+   AND AD_ISORGINCLUDED(S.AD_Org_ID,C_DocType.AD_Org_ID, S.AD_Client_ID) <> -1
    AND S.C_SETTLEMENT_ID = v_Record_ID
    AND S.C_DOCTYPE_ID = C_DocType.C_DOCTYPE_ID;
       IF v_Aux=0 THEN
@@ -252,7 +252,7 @@
         OR c.C_SETTLEMENT_GENERATE_ID=v_Record_ID)
         AND s.C_SETTLEMENT_ID=v_Record_ID
         AND Ad_Isorgincluded(c.AD_ORG_ID, s.AD_ORG_ID, s.AD_CLIENT_ID)=-1;
-      IF v_Aux&gt;0 THEN
+      IF v_Aux>0 THEN
         RAISE_APPLICATION_ERROR(-20000, '@OrgDebtpayment@'||v_column_identifier||' '||'@OrgdifferentSettlement@') ;
       END IF;
     END IF;--FINISH_PROCESS
@@ -262,9 +262,9 @@
       INTO v_Aux
       FROM C_DEBT_PAYMENT p
       WHERE p.C_Settlement_Cancel_ID=v_Record_ID
-        AND C_Debt_Payment_Status(p.C_SETTLEMENT_CANCEL_ID, p.Cancel_Processed, p.Generate_Processed, p.IsPaid, p.IsValid, p.C_CashLine_ID, p.C_BankStatementLine_ID)&lt;&gt;'P';
+        AND C_Debt_Payment_Status(p.C_SETTLEMENT_CANCEL_ID, p.Cancel_Processed, p.Generate_Processed, p.IsPaid, p.IsValid, p.C_CashLine_ID, p.C_BankStatementLine_ID)<>'P';
       -- If p_PInstance_ID is null there is not need to check Debt/Payment Status
-      IF((v_Aux&gt;0) AND(p_PInstance_ID IS NOT NULL)) THEN
+      IF((v_Aux>0) AND(p_PInstance_ID IS NOT NULL)) THEN
         RAISE_APPLICATION_ERROR(-20000, '@DebtPaymentNotPending@') ;
       END IF;
 	  --Until here to be deprecated
@@ -279,7 +279,7 @@
         AND ml.C_Debt_Payment_ID=dp.C_Debt_Payment_ID
         AND dp.C_Settlement_Cancel_ID=v_Record_ID
         AND m.processed='Y'
-        AND m.DateAcct&gt;v_DateAcct;
+        AND m.DateAcct>v_DateAcct;
       if v_Aux!=0 then
 	  	SELECT m.DOCUMENTNO, AD_COLUMN_IDENTIFIER_STD ('C_Debt_Payment', TO_CHAR(ml.C_Debt_Payment_Id))
 		INTO v_documentno_Dp_Management, v_column_identifier
@@ -322,7 +322,7 @@
         GeneratedAmt=v_GeneratedAmt,
         ChargedAmt=v_ChargedAmt
       WHERE C_Settlement_ID=v_Record_ID;
-      IF(v_CanceledNotChargeAmt&lt;&gt;v_GeneratedAmt) THEN
+      IF(v_CanceledNotChargeAmt<>v_GeneratedAmt) THEN
         RAISE_APPLICATION_ERROR(-20000, '@SettlementNotMatch@') ;
       END IF;
     END IF;--FINISH_PROCESS
@@ -345,8 +345,8 @@
       FROM C_Debt_Payment_V c
       WHERE c.C_Settlement_Generate_ID=v_Record_ID
         AND c.isManual='Y'
-        AND c.Amount&lt;&gt;c.GLItemAmt;
-      IF(v_Aux&gt;0) THEN
+        AND c.Amount<>c.GLItemAmt;
+      IF(v_Aux>0) THEN
         SELECT Ad_Column_Identifier_Std('C_Debt_Payment', to_char(v_Debt_Payment_ID))
         INTO v_column_identifier
         FROM DUAL;
@@ -498,12 +498,12 @@
         Processed='Y'
       WHERE C_Settlement_ID=v_Record_ID;
     END IF;--FINISH_PROCESS
-    --&lt;&lt;FINISH_PROCESS&gt;&gt;
+    --<<FINISH_PROCESS>>
     --  Update AD_PInstance
     IF(p_PInstance_ID IS NOT NULL) THEN
       DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
       AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'N', v_Result, v_Message) ;
-      DBMS_OUTPUT.PUT_LINE('--&lt;&lt;C_Settlement_Post finished&gt;&gt; ' || v_Message) ;
+      DBMS_OUTPUT.PUT_LINE('--<<C_Settlement_Post finished>> ' || v_Message) ;
     END IF;
     RETURN;
   END; --BODY
@@ -537,6 +537,7 @@
   END IF;
   RETURN;
 END C_Settlement_Post
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_SETTLEMENT_POST0.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_SETTLEMENT_POST0.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION C_SETTLEMENT_POST0">
     <function name="C_SETTLEMENT_POST0" type="NULL">
       <parameter name="p_PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -21,6 +21,7 @@
 BEGIN
   C_Settlement_Post(p_PInstance_ID, NULL) ;
 END C_Settlement_Post0
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_TRIM.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_TRIM.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION C_TRIM">
     <function name="C_TRIM" type="VARCHAR">
       <parameter name="p_str" type="VARCHAR"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -21,13 +21,14 @@
   v_str VARCHAR2(4000) ;
 BEGIN
   v_str:=p_str;
-  WHILE(INSTR(v_str, '  ', 1, 1) &lt;&gt; 0)
+  WHILE(INSTR(v_str, '  ', 1, 1) <> 0)
   LOOP
     v_str:=REPLACE(v_str, '  ', ' ') ;
   END LOOP;
   v_str:=LTRIM(RTRIM(v_str)) ;
   RETURN(v_str) ;
 END C_TRIM
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_UOM_CONVERT.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_UOM_CONVERT.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -5,7 +5,7 @@
       <parameter name="p_UOMFrom_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_UOMTo_ID" type="NUMERIC" mode="in"/>
       <parameter name="p_StdPrecision" type="VARCHAR" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * The contents of this file are subject to the Compiere License
 * Version 2.5.0 ("License"); You may not use this file except in
 * compliance with the License. You may obtain a copy of the License at
@@ -14,7 +14,7 @@
 * "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  Compiere  ERP &amp;  Business Solution
+* The Original Code is  Compiere  ERP &  Business Solution
 * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
 Inc.
 * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -30,7 +30,7 @@
 *  from UOMFrom_ID to UOMTo_ID
 *  standard or costing precision based on target UOM
 * Test:
-*  SELECT C_UOM_Convert (11,101,102, 'Y') FROM DUAL =&gt; 1.38
+*  SELECT C_UOM_Convert (11,101,102, 'Y') FROM DUAL => 1.38
 ************************************************************************/
   v_Result           NUMBER := NULL;
   v_Rate             NUMBER := NULL;
@@ -91,6 +91,7 @@
   END IF;
 RETURN v_Result;
 END C_UOM_Convert 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_VALIDCOMBINATION_GET.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_VALIDCOMBINATION_GET.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -21,7 +21,7 @@
       <parameter name="p_C_Activity_ID" type="NUMERIC" mode="in" default="NULL"/>
       <parameter name="p_User1_ID" type="NUMERIC" mode="in" default="NULL"/>
       <parameter name="p_User2_ID" type="NUMERIC" mode="in" default="NULL"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   * Version 2.5.0 ("License"); You may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
@@ -30,7 +30,7 @@
   * "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  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -259,6 +259,7 @@
     END IF;
 END C_ValidCombination_Get
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_VALIDCOMBINATION_INSERT.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_VALIDCOMBINATION_INSERT.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -21,7 +21,7 @@
       <parameter name="p_C_Activity_ID" type="NUMERIC" mode="in" default="NULL"/>
       <parameter name="p_User1_ID" type="NUMERIC" mode="in" default="NULL"/>
       <parameter name="p_User2_ID" type="NUMERIC" mode="in" default="NULL"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -234,6 +234,7 @@
     END IF;
 END C_ValidCombination_Insert
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/C_YEARPERIODS.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/C_YEARPERIODS.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -2,7 +2,7 @@
   <database name="FUNCTION C_YEARPERIODS">
     <function name="C_YEARPERIODS" type="NULL">
       <parameter name="PInstance_ID" type="NUMERIC" mode="in"/>
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   * Version 2.5.0 ("License"); You may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
@@ -11,7 +11,7 @@
   * "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  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -120,7 +120,7 @@
       END IF;
     END LOOP;
     --  Update AD_PInstance
-    --&lt;&lt;END_PROCEDURE&gt;&gt;
+    --<<END_PROCEDURE>>
     --  DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished');
     AD_UPDATE_PINSTANCE(PInstance_ID, NULL, 'N', 1, NULL) ;
     RETURN;
@@ -133,6 +133,7 @@
   RETURN;
 END C_YearPeriods
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/DATE_NULO.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/DATE_NULO.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
   <database name="FUNCTION DATE_NULO">
     <function name="DATE_NULO" type="TIMESTAMP">
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
 * 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
@@ -20,6 +20,7 @@
 BEGIN
   RETURN(NULL) ;
 END DATE_NULO
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/DBA_AFTERIMPORT.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/DBA_AFTERIMPORT.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
   <database name="FUNCTION DBA_AFTERIMPORT">
     <function name="DBA_AFTERIMPORT" type="NULL">
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   * Version 2.5.0 ("License"); You may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
@@ -10,7 +10,7 @@
   * "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  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -44,7 +44,7 @@
       FROM USER_TABLES
       WHERE DURATION IS NULL -- No temporary tables
         AND(LAST_ANALYZED IS NULL
-        OR LAST_ANALYZED&lt;SysDate-7)
+        OR LAST_ANALYZED<SysDate-7)
       )
     LOOP
       v_Cmd:='ANALYZE TABLE ' || Cur_Stat.Table_Name || ' COMPUTE STATISTICS';
@@ -55,6 +55,7 @@
     --
 END DBA_AfterImport
 
-</body>
+
+]]></body>
     </function>
   </database>
--- a/database/model/functions/DBA_CLEANUP.xml	Fri Dec 14 16:05:32 2007 +0000
+++ b/database/model/functions/DBA_CLEANUP.xml	Fri Dec 14 16:21:33 2007 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
   <database name="FUNCTION DBA_CLEANUP">
     <function name="DBA_CLEANUP" type="NULL">
-      <body>/*************************************************************************
+      <body><![CDATA[/*************************************************************************
   * The contents of this file are subject to the Compiere License
   * Version 2.5.0 ("License"); You may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
@@ -10,7 +10,7 @@
   * "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  Compiere  ERP &amp;  Business Solution
+  * The Original Code is  Compiere  ERP &  Business Solution
   * The Initial Developer of the Original Code is Jorg Janke  and ComPiere,
   Inc.
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
@@ -44,7 +44,7 @@
   v_rowcount:=SQL%ROWCOUNT;