CI: promote changesets from pi to main
authorRM packaging bot <staff.rm@openbravo.com>
Fri, 05 Nov 2010 11:44:01 +0000
changeset 8839 f2cf138fa03c
parent 8838 b56ec36bdf32 (current diff)
parent 8797 1528be065b3b (diff)
child 8840 3302044cd2d3
child 9018 1f84d66d0fcd
CI: promote changesets from pi to main
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_MESSAGE.xml
src-db/database/sourcedata/AD_MODULE.xml
src/org/openbravo/erpCommon/ad_forms/InstancePurpose.html
src/org/openbravo/erpCommon/utility/Home.html
src/org/openbravo/erpCommon/utility/Home.java
--- a/config/Openbravo.properties.template	Thu Nov 04 21:11:37 2010 +0100
+++ b/config/Openbravo.properties.template	Fri Nov 05 11:44:01 2010 +0000
@@ -111,7 +111,7 @@
 # Authentication #
 ##################
 
-# Leave this empty to use the default login hardler.
+# Leave this empty to use the default login handler.
 # LAM server example: org.openbravo.authentication.lam.LamAuthenticationManager
 authentication.class=
 
@@ -170,8 +170,8 @@
 # Log in security #
 ###################
 
-# If these properties are set, after log in trail failed the response time 
-# will be delayed, and the user can be blocked.
+# If these properties are set, after a failed login the response time 
+# will be delayed, and the user account can be blocked.
 login.trial.delay.increment=0
 login.trial.delay.max=0
 login.trial.user.lock=0
--- a/referencedata/standard/Initial_Setup.xml	Thu Nov 04 21:11:37 2010 +0100
+++ b/referencedata/standard/Initial_Setup.xml	Fri Nov 05 11:44:01 2010 +0000
@@ -548,7 +548,7 @@
     <salesTransaction>true</salesTransaction>
     <sOSubType>WR</sOSubType>
     <documentTypeForShipment id="F8CC92C7234644DEAD9F63174F45B2BF" entity-name="DocumentType" identifier="MM Shipment Indirect"/>
-    <documentTypeForInvoice id="40EE9B1CD3B345FABEFDA62B407B407F" entity-name="DocumentType" identifier="AR Invoice Indirect"/>
+    <documentTypeForInvoice id="40EE9B1CD3B345FABEFDA62B407B407F" entity-name="DocumentType" identifier="AR Invoice"/>
     <sequencedDocument>true</sequencedDocument>
     <documentSequence id="FFB42B38D6A34634B534AB499B13644C" entity-name="ADSequence" identifier="POS Order"/>
     <gLCategory id="745A2B441A2644DF934D1B1E462292E9" entity-name="FinancialMgmtGLCategory" identifier="None"/>
@@ -1449,147 +1449,195 @@
     <restartSequenceEveryYear>false</restartSequenceEveryYear>
   </ADSequence>
   <DocumentTemplate id="02376C41DA824413A9BE649443924C03" identifier="Purchase Order Report template">
-    <name>Purchase Order Report template</name>
     <id>02376C41DA824413A9BE649443924C03</id>
     <active>true</active>
     <documentType id="808F8818F724497D94282AC83493F394" entity-name="DocumentType" identifier="Purchase Order"/>
+    <name>Purchase Order Report template</name>
     <templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
     <reportFilename>Purchase Order-@our_ref@</reportFilename>
     <templateFilename>RptC_OrderPO.jrxml</templateFilename>
+    <showcompanydata>true</showcompanydata>
+    <showlogo>true</showlogo>
+    <headermargin xsi:nil="true"/>
   </DocumentTemplate>
   <DocumentTemplate id="11DD7B13EAC94215B6F8F735BBED4D55" identifier="Quotation Report template">
-    <name>Quotation Report template</name>
     <id>11DD7B13EAC94215B6F8F735BBED4D55</id>
     <active>true</active>
     <documentType id="0A1D4A2DB7144D81A821E31A9B332ACB" entity-name="DocumentType" identifier="Quotation"/>
+    <name>Quotation Report template</name>
     <templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
     <reportFilename>Sales Order-@our_ref@</reportFilename>
     <templateFilename>C_OrderJR.jrxml</templateFilename>
+    <showcompanydata>true</showcompanydata>
+    <showlogo>true</showlogo>
+    <headermargin xsi:nil="true"/>
   </DocumentTemplate>
   <DocumentTemplate id="4F23CD7CD64D468EA4753C0C7B09FD53" identifier="Return Material Report template">
-    <name>Return Material Report template</name>
     <id>4F23CD7CD64D468EA4753C0C7B09FD53</id>
     <active>true</active>
     <documentType id="2D7C15F0F44E4F289A729415EFD700C1" entity-name="DocumentType" identifier="Return Material"/>
+    <name>Return Material Report template</name>
     <templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
     <reportFilename>Sales Order-@our_ref@</reportFilename>
     <templateFilename>C_OrderJR.jrxml</templateFilename>
+    <showcompanydata>true</showcompanydata>
+    <showlogo>true</showlogo>
+    <headermargin xsi:nil="true"/>
   </DocumentTemplate>
   <DocumentTemplate id="70AEA0C77DB743A4A89058BFE091FEEA" identifier="Standard order report template">
-    <name>Standard order report template</name>
     <id>70AEA0C77DB743A4A89058BFE091FEEA</id>
     <active>true</active>
     <documentType id="CB6EEA256BBC41109911215C5A14D39B" entity-name="DocumentType" identifier="Standard Order"/>
+    <name>Standard order report template</name>
     <templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
     <reportFilename>StandardOrder-@our_ref@</reportFilename>
     <templateFilename>C_OrderJR.jrxml</templateFilename>
+    <showcompanydata>true</showcompanydata>
+    <showlogo>true</showlogo>
+    <headermargin xsi:nil="true"/>
   </DocumentTemplate>
   <DocumentTemplate id="9FB97CCA66EA49F29A0EF5080E2AFF29" identifier="AR Credit Memo Report template">
-    <name>AR Credit Memo Report template</name>
     <id>9FB97CCA66EA49F29A0EF5080E2AFF29</id>
     <active>true</active>
     <documentType id="B476CFAE109047DEB5BC9AC80A03297A" entity-name="DocumentType" identifier="AR Credit Memo"/>
+    <name>AR Credit Memo Report template</name>
     <templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
     <reportFilename>Sales Invoice-@our_ref@</reportFilename>
     <templateFilename>RptC_Invoice.jrxml</templateFilename>
+    <showcompanydata>true</showcompanydata>
+    <showlogo>true</showlogo>
+    <headermargin xsi:nil="true"/>
   </DocumentTemplate>
   <DocumentTemplate id="A16BD46A069F4502BDDFD9A555AEAA48" identifier="AR Invoice Report template">
-    <name>AR Invoice Report template</name>
     <id>A16BD46A069F4502BDDFD9A555AEAA48</id>
     <active>true</active>
     <documentType id="40EE9B1CD3B345FABEFDA62B407B407F" entity-name="DocumentType" identifier="AR Invoice"/>
+    <name>AR Invoice Report template</name>
     <templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
     <reportFilename>Sales Invoice-@our_ref@</reportFilename>
     <templateFilename>RptC_Invoice.jrxml</templateFilename>
+    <showcompanydata>true</showcompanydata>
+    <showlogo>true</showlogo>
+    <headermargin xsi:nil="true"/>
   </DocumentTemplate>
   <DocumentTemplate id="A76CE6794C2E467394C21675524DBA9C" identifier="Proposal Report template">
-    <name>Proposal Report template</name>
     <id>A76CE6794C2E467394C21675524DBA9C</id>
     <active>true</active>
     <documentType id="15C8DCE82DA841968ABCD614FED68576" entity-name="DocumentType" identifier="Proposal"/>
+    <name>Proposal Report template</name>
     <templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
     <reportFilename>Sales Order-@our_ref@</reportFilename>
     <templateFilename>C_OrderJR.jrxml</templateFilename>
+    <showcompanydata>true</showcompanydata>
+    <showlogo>true</showlogo>
+    <headermargin xsi:nil="true"/>
   </DocumentTemplate>
   <DocumentTemplate id="AF10A903167240F883C7EE7A3325981D" identifier="POS Order Report template">
-    <name>POS Order Report template</name>
     <id>AF10A903167240F883C7EE7A3325981D</id>
     <active>true</active>
     <documentType id="511A9371A0F74195AA3F6D66C722729D" entity-name="DocumentType" identifier="POS Order"/>
+    <name>POS Order Report template</name>
     <templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
     <reportFilename>Sales Order-@our_ref@</reportFilename>
     <templateFilename>C_OrderJR.jrxml</templateFilename>
+    <showcompanydata>true</showcompanydata>
+    <showlogo>true</showlogo>
+    <headermargin xsi:nil="true"/>
   </DocumentTemplate>
   <DocumentTemplate id="B1DF02E45C4946C7BB1D45C065C49577" identifier="AP Credit Report template">
-    <name>AP Credit Report template</name>
     <id>B1DF02E45C4946C7BB1D45C065C49577</id>
     <active>true</active>
     <documentType id="42B7DE94BC324C3F9CC0934375E90FFF" entity-name="DocumentType" identifier="AP CreditMemo"/>
+    <name>AP Credit Report template</name>
     <templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
     <reportFilename>Purchase Invoice-@our_ref@</reportFilename>
     <templateFilename>RptC_Invoice.jrxml</templateFilename>
+    <showcompanydata>true</showcompanydata>
+    <showlogo>true</showlogo>
+    <headermargin xsi:nil="true"/>
   </DocumentTemplate>
   <DocumentTemplate id="B94A012B25FB4C319804BED013BD584B" identifier="Prepay Order Report template">
-    <name>Prepay Order Report template</name>
     <id>B94A012B25FB4C319804BED013BD584B</id>
     <active>true</active>
     <documentType id="15F495A6290040F194A9AA4622FE0C01" entity-name="DocumentType" identifier="Prepay Order"/>
+    <name>Prepay Order Report template</name>
     <templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
     <reportFilename>Sales Order-@our_ref@</reportFilename>
     <templateFilename>C_OrderJR.jrxml</templateFilename>
+    <showcompanydata>true</showcompanydata>
+    <showlogo>true</showlogo>
+    <headermargin xsi:nil="true"/>
   </DocumentTemplate>
   <DocumentTemplate id="BC7220FEA2F44F9C9FB6619FC58B6944" identifier="MM Receipt Report template">
-    <name>MM Receipt Report template</name>
     <id>BC7220FEA2F44F9C9FB6619FC58B6944</id>
     <active>true</active>
     <documentType id="2030AD7DD4284E2B936E261662EF735A" entity-name="DocumentType" identifier="MM Receipt"/>
+    <name>MM Receipt Report template</name>
     <templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
     <reportFilename>Goods Receipt-@our_ref@</reportFilename>
     <templateFilename>RptM_InOut.jrxml</templateFilename>
+    <showcompanydata>true</showcompanydata>
+    <showlogo>true</showlogo>
+    <headermargin xsi:nil="true"/>
   </DocumentTemplate>
   <DocumentTemplate id="C6A6AF1CA3C94B3899CAEC27EE427402" identifier="MM Shipment Report template">
-    <name>MM Shipment Report template</name>
     <id>C6A6AF1CA3C94B3899CAEC27EE427402</id>
     <active>true</active>
     <documentType id="0CD50184705A42CCBECA4EC967646440" entity-name="DocumentType" identifier="MM Shipment"/>
+    <name>MM Shipment Report template</name>
     <templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
     <reportFilename>Goods Shipment-@our_ref@</reportFilename>
     <templateFilename>RptM_InOut.jrxml</templateFilename>
+    <showcompanydata>true</showcompanydata>
+    <showlogo>true</showlogo>
+    <headermargin xsi:nil="true"/>
   </DocumentTemplate>
   <DocumentTemplate id="C76E1DE89DA04BF6B6FAEDDA0216EE7A" identifier="Warehouse Order Memo Report template">
-    <name>Warehouse Order Memo Report template</name>
     <id>C76E1DE89DA04BF6B6FAEDDA0216EE7A</id>
     <active>true</active>
     <documentType id="76E7C671FCE34556908E563F825C2937" entity-name="DocumentType" identifier="Warehouse Order"/>
+    <name>Warehouse Order Memo Report template</name>
     <templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
     <reportFilename>Sales Order-@our_ref@</reportFilename>
     <templateFilename>C_OrderJR.jrxml</templateFilename>
+    <showcompanydata>true</showcompanydata>
+    <showlogo>true</showlogo>
+    <headermargin xsi:nil="true"/>
   </DocumentTemplate>
   <DocumentTemplate id="D9BB431F120746C8A84266CA42D02029" identifier="On Credit Order Report template">
-    <name>On Credit Order Report template</name>
     <id>D9BB431F120746C8A84266CA42D02029</id>
     <active>true</active>
     <documentType id="E7F4802D902A42A59143DCCBEDE4DE85" entity-name="DocumentType" identifier="Credit Order"/>
+    <name>On Credit Order Report template</name>
     <templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
     <reportFilename>Sales Order-@our_ref@</reportFilename>
     <templateFilename>C_OrderJR.jrxml</templateFilename>
+    <showcompanydata>true</showcompanydata>
+    <showlogo>true</showlogo>
+    <headermargin xsi:nil="true"/>
   </DocumentTemplate>
   <DocumentTemplate id="E5901A1122F641089417A08A7317764C" identifier="AP Invoice Report template">
-    <name>AP Invoice Report template</name>
     <id>E5901A1122F641089417A08A7317764C</id>
     <active>true</active>
     <documentType id="5C6E02993E9B4FCA81C07955EF676C62" entity-name="DocumentType" identifier="AP Invoice"/>
+    <name>AP Invoice Report template</name>
     <templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
     <reportFilename>Invoice-@our_ref@</reportFilename>
     <templateFilename>RptC_Invoice.jrxml</templateFilename>
+    <showcompanydata>true</showcompanydata>
+    <showlogo>true</showlogo>
+    <headermargin xsi:nil="true"/>
   </DocumentTemplate>
   <DocumentTemplate id="E87E9B580A024383B2E79BD768288899" identifier="MM Shipment Indirect Report template">
-    <name>MM Shipment Indirect Report template</name>
     <id>E87E9B580A024383B2E79BD768288899</id>
     <active>true</active>
     <documentType id="F8CC92C7234644DEAD9F63174F45B2BF" entity-name="DocumentType" identifier="MM Shipment Indirect"/>
+    <name>MM Shipment Indirect Report template</name>
     <templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
     <reportFilename>Goods Shipment-@our_ref@</reportFilename>
     <templateFilename>RptM_InOut.jrxml</templateFilename>
+    <showcompanydata>true</showcompanydata>
+    <showlogo>true</showlogo>
+    <headermargin xsi:nil="true"/>
   </DocumentTemplate>
 </ob:Openbravo>
--- a/src-db/database/model/functions/A_ASSET_CREATE.xml	Thu Nov 04 21:11:37 2010 +0100
+++ b/src-db/database/model/functions/A_ASSET_CREATE.xml	Fri Nov 05 11:44:01 2010 +0000
@@ -54,6 +54,7 @@
     v_Value VARCHAR2(60) ;
     v_Name VARCHAR2(80) ;
     v_count NUMBER:=0;
+    v_Asset_Value VARCHAR2(200) ;
   BEGIN
     --  Update AD_PInstance
     IF(p_PInstance_ID IS NOT NULL) THEN
@@ -110,6 +111,7 @@
           END IF;
           v_Value:='_' || Cur_Shipline.Value || v_DocumentNo;
           v_Name:='_' || Cur_Shipline.Name || v_DocumentNo;
+          v_Asset_Value:=SUBSTR(Cur_Shipline.BP_Value, 1, 40-LENGTH(v_Value)) || v_Value;
           --
           INSERT
           INTO A_Asset
@@ -120,7 +122,7 @@
               LocationComment, C_BPartner_ID, C_BPartner_Location_ID, AD_User_ID
             )
             VALUES
-            (v_A_Asset_ID, Cur_Shipline.AD_Client_ID, Cur_Shipline.AD_Org_ID, 'Y', now(), '0', now(), '0', SUBSTR(Cur_Shipline.BP_Value, 1, 40-LENGTH(v_Value)) || v_Value, SUBSTR(Cur_Shipline.BP_Name, 1,
+            (v_A_Asset_ID, Cur_Shipline.AD_Client_ID, Cur_Shipline.AD_Org_ID, 'Y', now(), '0', now(), '0', SUBSTR(v_Asset_Value,1,40), SUBSTR(Cur_Shipline.BP_Name, 1,
             60-LENGTH(v_Name)) || v_Name, SUBSTR(Cur_Shipline.Description || ' ' || Cur_Shipline.LineDescription, 1, 255), Cur_Shipline.Help, Cur_Shipline.A_Asset_Group_ID, Cur_Shipline.M_Product_ID,
             Cur_Shipline.VersionNo, Cur_Shipline.GuaranteeDate, Cur_Shipline.MovementDate, 'N', 'N', null, 'N', v_DocumentNo, Cur_Shipline.C_BPartner_ID, Cur_Shipline.C_BPartner_Location_ID, Cur_Shipline.AD_User_ID) ;
             DBMS_OUTPUT.PUT_LINE('A_Asset_ID=' || v_A_Asset_ID || ' - ' || Cur_Shipline.Value||v_DocumentNo) ;
--- a/src-db/database/model/prescript-PostgreSql.sql	Thu Nov 04 21:11:37 2010 +0100
+++ b/src-db/database/model/prescript-PostgreSql.sql	Fri Nov 05 11:44:01 2010 +0000
@@ -167,7 +167,7 @@
 )
 RETURNS NUMERIC AS '
 BEGIN
-RETURN to_number($1, ''S99999999999999D999999'');
+RETURN to_number($1, ''S99999999999999D9999999999'');
 EXCEPTION 
   WHEN OTHERS THEN 
     RETURN NULL;
@@ -193,7 +193,7 @@
   RETURNS "numeric" AS
 $BODY$
 BEGIN
-RETURN to_number($1, 'S99999999999999D999999');
+RETURN to_number($1, 'S99999999999999D9999999999');
 EXCEPTION 
   WHEN OTHERS THEN 
     RETURN NULL;
--- a/src-db/database/model/tables/AD_HEARTBEAT_LOG.xml	Thu Nov 04 21:11:37 2010 +0100
+++ b/src-db/database/model/tables/AD_HEARTBEAT_LOG.xml	Fri Nov 05 11:44:01 2010 +0000
@@ -181,6 +181,14 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="REJECTED_LOGINS_DUE_CONC_USERS" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="INSTANCENO" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="AD_HEARTBEAT_LOG_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Thu Nov 04 21:11:37 2010 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Fri Nov 05 11:44:01 2010 +0000
@@ -94973,6 +94973,7 @@
 <!--5669-->  <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
 <!--5669-->  <AD_TABLE_ID><![CDATA[429]]></AD_TABLE_ID>
 <!--5669-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--5669-->  <AD_VAL_RULE_ID><![CDATA[49DC1D6F086945AB82F84C66F5F13F16]]></AD_VAL_RULE_ID>
 <!--5669-->  <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH>
 <!--5669-->  <DEFAULTVALUE><![CDATA[@AD_Org_ID@]]></DEFAULTVALUE>
 <!--5669-->  <ISKEY><![CDATA[N]]></ISKEY>
@@ -286302,6 +286303,39 @@
 <!--6FAE1CEA240BF328E040007F01001BBD-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
 <!--6FAE1CEA240BF328E040007F01001BBD--></AD_COLUMN>
 
+<!--6FBE5F4BF5294BD788767799EBEF47EF--><AD_COLUMN>
+<!--6FBE5F4BF5294BD788767799EBEF47EF-->  <AD_COLUMN_ID><![CDATA[6FBE5F4BF5294BD788767799EBEF47EF]]></AD_COLUMN_ID>
+<!--6FBE5F4BF5294BD788767799EBEF47EF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6FBE5F4BF5294BD788767799EBEF47EF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6FBE5F4BF5294BD788767799EBEF47EF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6FBE5F4BF5294BD788767799EBEF47EF-->  <NAME><![CDATA[Instance Number]]></NAME>
+<!--6FBE5F4BF5294BD788767799EBEF47EF-->  <DESCRIPTION><![CDATA[Professional Edition Instance Number]]></DESCRIPTION>
+<!--6FBE5F4BF5294BD788767799EBEF47EF-->  <HELP><![CDATA[Each Professional Edition license can activate multiple instances, this number is an identifier for each of the instances registered for the current license.]]></HELP>
+<!--6FBE5F4BF5294BD788767799EBEF47EF-->  <COLUMNNAME><![CDATA[InstanceNo]]></COLUMNNAME>
+<!--6FBE5F4BF5294BD788767799EBEF47EF-->  <AD_TABLE_ID><![CDATA[1005400006]]></AD_TABLE_ID>
+<!--6FBE5F4BF5294BD788767799EBEF47EF-->  <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
+<!--6FBE5F4BF5294BD788767799EBEF47EF-->  <FIELDLENGTH><![CDATA[3]]></FIELDLENGTH>
+<!--6FBE5F4BF5294BD788767799EBEF47EF-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--6FBE5F4BF5294BD788767799EBEF47EF-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--6FBE5F4BF5294BD788767799EBEF47EF-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--6FBE5F4BF5294BD788767799EBEF47EF-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--6FBE5F4BF5294BD788767799EBEF47EF-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--6FBE5F4BF5294BD788767799EBEF47EF-->  <SEQNO><![CDATA[470]]></SEQNO>
+<!--6FBE5F4BF5294BD788767799EBEF47EF-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--6FBE5F4BF5294BD788767799EBEF47EF-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--6FBE5F4BF5294BD788767799EBEF47EF-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--6FBE5F4BF5294BD788767799EBEF47EF-->  <AD_ELEMENT_ID><![CDATA[CEFF12045E10490496BA6CE8AC1AD27A]]></AD_ELEMENT_ID>
+<!--6FBE5F4BF5294BD788767799EBEF47EF-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--6FBE5F4BF5294BD788767799EBEF47EF-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--6FBE5F4BF5294BD788767799EBEF47EF-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--6FBE5F4BF5294BD788767799EBEF47EF-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--6FBE5F4BF5294BD788767799EBEF47EF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6FBE5F4BF5294BD788767799EBEF47EF-->  <POSITION><![CDATA[47]]></POSITION>
+<!--6FBE5F4BF5294BD788767799EBEF47EF-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--6FBE5F4BF5294BD788767799EBEF47EF-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--6FBE5F4BF5294BD788767799EBEF47EF-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--6FBE5F4BF5294BD788767799EBEF47EF--></AD_COLUMN>
+
 <!--6FC81155EFCA5F73E040007F01001378--><AD_COLUMN>
 <!--6FC81155EFCA5F73E040007F01001378-->  <AD_COLUMN_ID><![CDATA[6FC81155EFCA5F73E040007F01001378]]></AD_COLUMN_ID>
 <!--6FC81155EFCA5F73E040007F01001378-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -294067,7 +294101,7 @@
 <!--7ED4235BAC474A13B9059BCE003BCAEF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7ED4235BAC474A13B9059BCE003BCAEF-->  <NAME><![CDATA[Export allowed]]></NAME>
 <!--7ED4235BAC474A13B9059BCE003BCAEF-->  <DESCRIPTION><![CDATA[This data set can be exported]]></DESCRIPTION>
-<!--7ED4235BAC474A13B9059BCE003BCAEF-->  <HELP><![CDATA[This data set can be exported.]]></HELP>
+<!--7ED4235BAC474A13B9059BCE003BCAEF-->  <HELP><![CDATA[This data set can be exported. There are datasets which are not meant to be exported, such as the AD dataset (which contains the set of tables which define the Application Dictionary), or the Client dataset. If the dataset needs to be exported via the Export Dataset functionality, this check should be marked. If it's going to be used for another purpose, and its data content doesn't need to be included inside the modules, then it should be unchecked. ]]></HELP>
 <!--7ED4235BAC474A13B9059BCE003BCAEF-->  <COLUMNNAME><![CDATA[ExportAllowed]]></COLUMNNAME>
 <!--7ED4235BAC474A13B9059BCE003BCAEF-->  <AD_TABLE_ID><![CDATA[08A203FD84AA412BB38882A1EDDD1A83]]></AD_TABLE_ID>
 <!--7ED4235BAC474A13B9059BCE003BCAEF-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
@@ -308909,6 +308943,38 @@
 <!--92FC7A19DAD0930CE040007F010048EB-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
 <!--92FC7A19DAD0930CE040007F010048EB--></AD_COLUMN>
 
+<!--9397E02890414B43E040007F0100749D--><AD_COLUMN>
+<!--9397E02890414B43E040007F0100749D-->  <AD_COLUMN_ID><![CDATA[9397E02890414B43E040007F0100749D]]></AD_COLUMN_ID>
+<!--9397E02890414B43E040007F0100749D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9397E02890414B43E040007F0100749D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9397E02890414B43E040007F0100749D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9397E02890414B43E040007F0100749D-->  <NAME><![CDATA[Rejected_Logins_Due_Conc_Users]]></NAME>
+<!--9397E02890414B43E040007F0100749D-->  <HELP><![CDATA[Number of rejected logins due to concurrent users limit on the last 30 days]]></HELP>
+<!--9397E02890414B43E040007F0100749D-->  <COLUMNNAME><![CDATA[Rejected_Logins_Due_Conc_Users]]></COLUMNNAME>
+<!--9397E02890414B43E040007F0100749D-->  <AD_TABLE_ID><![CDATA[1005400006]]></AD_TABLE_ID>
+<!--9397E02890414B43E040007F0100749D-->  <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
+<!--9397E02890414B43E040007F0100749D-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--9397E02890414B43E040007F0100749D-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--9397E02890414B43E040007F0100749D-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--9397E02890414B43E040007F0100749D-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--9397E02890414B43E040007F0100749D-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--9397E02890414B43E040007F0100749D-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--9397E02890414B43E040007F0100749D-->  <SEQNO><![CDATA[460]]></SEQNO>
+<!--9397E02890414B43E040007F0100749D-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--9397E02890414B43E040007F0100749D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9397E02890414B43E040007F0100749D-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--9397E02890414B43E040007F0100749D-->  <AD_ELEMENT_ID><![CDATA[9397E02890444B43E040007F0100749D]]></AD_ELEMENT_ID>
+<!--9397E02890414B43E040007F0100749D-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--9397E02890414B43E040007F0100749D-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--9397E02890414B43E040007F0100749D-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--9397E02890414B43E040007F0100749D-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--9397E02890414B43E040007F0100749D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9397E02890414B43E040007F0100749D-->  <POSITION><![CDATA[46]]></POSITION>
+<!--9397E02890414B43E040007F0100749D-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--9397E02890414B43E040007F0100749D-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--9397E02890414B43E040007F0100749D-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--9397E02890414B43E040007F0100749D--></AD_COLUMN>
+
 <!--95228909B4A44702B0D71D14DBBB2E44--><AD_COLUMN>
 <!--95228909B4A44702B0D71D14DBBB2E44-->  <AD_COLUMN_ID><![CDATA[95228909B4A44702B0D71D14DBBB2E44]]></AD_COLUMN_ID>
 <!--95228909B4A44702B0D71D14DBBB2E44-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 04 21:11:37 2010 +0100
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml	Fri Nov 05 11:44:01 2010 +0000
@@ -24484,7 +24484,7 @@
 <!--5AC5B513B969D9D1E040007F01001637-->  <NAME><![CDATA[Export allowed]]></NAME>
 <!--5AC5B513B969D9D1E040007F01001637-->  <PRINTNAME><![CDATA[Export allowed]]></PRINTNAME>
 <!--5AC5B513B969D9D1E040007F01001637-->  <DESCRIPTION><![CDATA[This data set can be exported]]></DESCRIPTION>
-<!--5AC5B513B969D9D1E040007F01001637-->  <HELP><![CDATA[This data set can be exported.]]></HELP>
+<!--5AC5B513B969D9D1E040007F01001637-->  <HELP><![CDATA[This data set can be exported. There are datasets which are not meant to be exported, such as the AD dataset (which contains the set of tables which define the Application Dictionary), or the Client dataset. If the dataset needs to be exported via the Export Dataset functionality, this check should be marked. If it's going to be used for another purpose, and its data content doesn't need to be included inside the modules, then it should be unchecked. ]]></HELP>
 <!--5AC5B513B969D9D1E040007F01001637-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--5AC5B513B969D9D1E040007F01001637--></AD_ELEMENT>
 
@@ -27299,6 +27299,18 @@
 <!--92960702F3C3E1DAE040007F010046D0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--92960702F3C3E1DAE040007F010046D0--></AD_ELEMENT>
 
+<!--9397E02890444B43E040007F0100749D--><AD_ELEMENT>
+<!--9397E02890444B43E040007F0100749D-->  <AD_ELEMENT_ID><![CDATA[9397E02890444B43E040007F0100749D]]></AD_ELEMENT_ID>
+<!--9397E02890444B43E040007F0100749D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9397E02890444B43E040007F0100749D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9397E02890444B43E040007F0100749D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9397E02890444B43E040007F0100749D-->  <COLUMNNAME><![CDATA[Rejected_Logins_Due_Conc_Users]]></COLUMNNAME>
+<!--9397E02890444B43E040007F0100749D-->  <NAME><![CDATA[Rejected logins due to concurrent users limit]]></NAME>
+<!--9397E02890444B43E040007F0100749D-->  <PRINTNAME><![CDATA[Rejected logins due to concurrent users limit]]></PRINTNAME>
+<!--9397E02890444B43E040007F0100749D-->  <HELP><![CDATA[Number of rejected logins due to concurrent users limit on the last 30 days]]></HELP>
+<!--9397E02890444B43E040007F0100749D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9397E02890444B43E040007F0100749D--></AD_ELEMENT>
+
 <!--9910D5BD35894A8FBBB365FB9239B711--><AD_ELEMENT>
 <!--9910D5BD35894A8FBBB365FB9239B711-->  <AD_ELEMENT_ID><![CDATA[9910D5BD35894A8FBBB365FB9239B711]]></AD_ELEMENT_ID>
 <!--9910D5BD35894A8FBBB365FB9239B711-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -27565,6 +27577,19 @@
 <!--CD57A1DBADD440EC9551AE6BC51E8643-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--CD57A1DBADD440EC9551AE6BC51E8643--></AD_ELEMENT>
 
+<!--CEFF12045E10490496BA6CE8AC1AD27A--><AD_ELEMENT>
+<!--CEFF12045E10490496BA6CE8AC1AD27A-->  <AD_ELEMENT_ID><![CDATA[CEFF12045E10490496BA6CE8AC1AD27A]]></AD_ELEMENT_ID>
+<!--CEFF12045E10490496BA6CE8AC1AD27A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CEFF12045E10490496BA6CE8AC1AD27A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CEFF12045E10490496BA6CE8AC1AD27A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CEFF12045E10490496BA6CE8AC1AD27A-->  <COLUMNNAME><![CDATA[InstanceNo]]></COLUMNNAME>
+<!--CEFF12045E10490496BA6CE8AC1AD27A-->  <NAME><![CDATA[Instance Number]]></NAME>
+<!--CEFF12045E10490496BA6CE8AC1AD27A-->  <PRINTNAME><![CDATA[Instance Number]]></PRINTNAME>
+<!--CEFF12045E10490496BA6CE8AC1AD27A-->  <DESCRIPTION><![CDATA[Professional Edition Instance Number]]></DESCRIPTION>
+<!--CEFF12045E10490496BA6CE8AC1AD27A-->  <HELP><![CDATA[Each Professional Edition license can activate multiple instances, this number is an identifier for each of the instances registered for the current license.]]></HELP>
+<!--CEFF12045E10490496BA6CE8AC1AD27A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--CEFF12045E10490496BA6CE8AC1AD27A--></AD_ELEMENT>
+
 <!--D190BE6617E04A41BF66468665BA145E--><AD_ELEMENT>
 <!--D190BE6617E04A41BF66468665BA145E-->  <AD_ELEMENT_ID><![CDATA[D190BE6617E04A41BF66468665BA145E]]></AD_ELEMENT_ID>
 <!--D190BE6617E04A41BF66468665BA145E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_FIELD.xml	Thu Nov 04 21:11:37 2010 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Fri Nov 05 11:44:01 2010 +0000
@@ -3956,7 +3956,7 @@
 <!--331-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--331-->  <AD_TAB_ID><![CDATA[146]]></AD_TAB_ID>
 <!--331-->  <AD_COLUMN_ID><![CDATA[350]]></AD_COLUMN_ID>
-<!--331-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--331-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
 <!--331-->  <DISPLAYLOGIC><![CDATA[@IsAutoSequence@='Y']]></DISPLAYLOGIC>
 <!--331-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
 <!--331-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
@@ -3964,7 +3964,7 @@
 <!--331-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--331-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--331-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--331-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--331-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--331-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--331-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--331--></AD_FIELD>
@@ -36128,7 +36128,7 @@
 <!--3125-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--3125-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--3125-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--3125-->  <SEQNO><![CDATA[200]]></SEQNO>
+<!--3125-->  <SEQNO><![CDATA[190]]></SEQNO>
 <!--3125-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--3125-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--3125-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -76628,7 +76628,7 @@
 <!--6235-->  <AD_COLUMN_ID><![CDATA[8169]]></AD_COLUMN_ID>
 <!--6235-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--6235-->  <DISPLAYLENGTH><![CDATA[21]]></DISPLAYLENGTH>
-<!--6235-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--6235-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
 <!--6235-->  <SEQNO><![CDATA[110]]></SEQNO>
 <!--6235-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--6235-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
@@ -119418,10 +119418,9 @@
 <!--800641-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--800641-->  <AD_TAB_ID><![CDATA[167]]></AD_TAB_ID>
 <!--800641-->  <AD_COLUMN_ID><![CDATA[800476]]></AD_COLUMN_ID>
-<!--800641-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--800641-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
 <!--800641-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
 <!--800641-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--800641-->  <SEQNO><![CDATA[190]]></SEQNO>
 <!--800641-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--800641-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800641-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -179175,7 +179174,7 @@
 <!--1005400227-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--1005400227-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
 <!--1005400227-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--1005400227-->  <SEQNO><![CDATA[190]]></SEQNO>
+<!--1005400227-->  <SEQNO><![CDATA[200]]></SEQNO>
 <!--1005400227-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1005400227-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1005400227-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -179197,7 +179196,7 @@
 <!--1005400228-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--1005400228-->  <DISPLAYLENGTH><![CDATA[20]]></DISPLAYLENGTH>
 <!--1005400228-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--1005400228-->  <SEQNO><![CDATA[230]]></SEQNO>
+<!--1005400228-->  <SEQNO><![CDATA[240]]></SEQNO>
 <!--1005400228-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1005400228-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1005400228-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -179219,7 +179218,7 @@
 <!--1005400229-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--1005400229-->  <DISPLAYLENGTH><![CDATA[6]]></DISPLAYLENGTH>
 <!--1005400229-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--1005400229-->  <SEQNO><![CDATA[240]]></SEQNO>
+<!--1005400229-->  <SEQNO><![CDATA[250]]></SEQNO>
 <!--1005400229-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1005400229-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1005400229-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -179241,7 +179240,7 @@
 <!--1005400230-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--1005400230-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
 <!--1005400230-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--1005400230-->  <SEQNO><![CDATA[210]]></SEQNO>
+<!--1005400230-->  <SEQNO><![CDATA[220]]></SEQNO>
 <!--1005400230-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1005400230-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1005400230-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -179263,7 +179262,7 @@
 <!--1005400231-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--1005400231-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
 <!--1005400231-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--1005400231-->  <SEQNO><![CDATA[220]]></SEQNO>
+<!--1005400231-->  <SEQNO><![CDATA[230]]></SEQNO>
 <!--1005400231-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1005400231-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1005400231-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -179285,7 +179284,7 @@
 <!--1005400232-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--1005400232-->  <DISPLAYLENGTH><![CDATA[20]]></DISPLAYLENGTH>
 <!--1005400232-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--1005400232-->  <SEQNO><![CDATA[90]]></SEQNO>
+<!--1005400232-->  <SEQNO><![CDATA[100]]></SEQNO>
 <!--1005400232-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1005400232-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1005400232-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -179307,7 +179306,7 @@
 <!--1005400233-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--1005400233-->  <DISPLAYLENGTH><![CDATA[20]]></DISPLAYLENGTH>
 <!--1005400233-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--1005400233-->  <SEQNO><![CDATA[100]]></SEQNO>
+<!--1005400233-->  <SEQNO><![CDATA[110]]></SEQNO>
 <!--1005400233-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--1005400233-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1005400233-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -179329,7 +179328,7 @@
 <!--1005400234-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--1005400234-->  <DISPLAYLENGTH><![CDATA[20]]></DISPLAYLENGTH>
 <!--1005400234-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--1005400234-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--1005400234-->  <SEQNO><![CDATA[120]]></SEQNO>
 <!--1005400234-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1005400234-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1005400234-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -179351,7 +179350,7 @@
 <!--1005400235-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--1005400235-->  <DISPLAYLENGTH><![CDATA[20]]></DISPLAYLENGTH>
 <!--1005400235-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--1005400235-->  <SEQNO><![CDATA[120]]></SEQNO>
+<!--1005400235-->  <SEQNO><![CDATA[130]]></SEQNO>
 <!--1005400235-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--1005400235-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1005400235-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -179373,7 +179372,7 @@
 <!--1005400236-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--1005400236-->  <DISPLAYLENGTH><![CDATA[20]]></DISPLAYLENGTH>
 <!--1005400236-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--1005400236-->  <SEQNO><![CDATA[130]]></SEQNO>
+<!--1005400236-->  <SEQNO><![CDATA[140]]></SEQNO>
 <!--1005400236-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1005400236-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1005400236-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -179395,7 +179394,7 @@
 <!--1005400237-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--1005400237-->  <DISPLAYLENGTH><![CDATA[20]]></DISPLAYLENGTH>
 <!--1005400237-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--1005400237-->  <SEQNO><![CDATA[140]]></SEQNO>
+<!--1005400237-->  <SEQNO><![CDATA[150]]></SEQNO>
 <!--1005400237-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--1005400237-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1005400237-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -179417,7 +179416,7 @@
 <!--1005400238-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--1005400238-->  <DISPLAYLENGTH><![CDATA[20]]></DISPLAYLENGTH>
 <!--1005400238-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--1005400238-->  <SEQNO><![CDATA[150]]></SEQNO>
+<!--1005400238-->  <SEQNO><![CDATA[160]]></SEQNO>
 <!--1005400238-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1005400238-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1005400238-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -179439,7 +179438,7 @@
 <!--1005400239-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--1005400239-->  <DISPLAYLENGTH><![CDATA[20]]></DISPLAYLENGTH>
 <!--1005400239-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--1005400239-->  <SEQNO><![CDATA[170]]></SEQNO>
+<!--1005400239-->  <SEQNO><![CDATA[180]]></SEQNO>
 <!--1005400239-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1005400239-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1005400239-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -179461,7 +179460,7 @@
 <!--1005400240-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--1005400240-->  <DISPLAYLENGTH><![CDATA[20]]></DISPLAYLENGTH>
 <!--1005400240-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--1005400240-->  <SEQNO><![CDATA[180]]></SEQNO>
+<!--1005400240-->  <SEQNO><![CDATA[190]]></SEQNO>
 <!--1005400240-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--1005400240-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1005400240-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -179483,7 +179482,7 @@
 <!--1005400241-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--1005400241-->  <DISPLAYLENGTH><![CDATA[20]]></DISPLAYLENGTH>
 <!--1005400241-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--1005400241-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--1005400241-->  <SEQNO><![CDATA[70]]></SEQNO>
 <!--1005400241-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1005400241-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1005400241-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -179506,7 +179505,7 @@
 <!--1005400242-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--1005400242-->  <DISPLAYLENGTH><![CDATA[20]]></DISPLAYLENGTH>
 <!--1005400242-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--1005400242-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--1005400242-->  <SEQNO><![CDATA[80]]></SEQNO>
 <!--1005400242-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--1005400242-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1005400242-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -179528,7 +179527,7 @@
 <!--1005400243-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--1005400243-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
 <!--1005400243-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--1005400243-->  <SEQNO><![CDATA[250]]></SEQNO>
+<!--1005400243-->  <SEQNO><![CDATA[260]]></SEQNO>
 <!--1005400243-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1005400243-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1005400243-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -179550,7 +179549,7 @@
 <!--1005400244-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--1005400244-->  <DISPLAYLENGTH><![CDATA[20]]></DISPLAYLENGTH>
 <!--1005400244-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--1005400244-->  <SEQNO><![CDATA[160]]></SEQNO>
+<!--1005400244-->  <SEQNO><![CDATA[170]]></SEQNO>
 <!--1005400244-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--1005400244-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1005400244-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -179572,7 +179571,7 @@
 <!--1005400267-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--1005400267-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
 <!--1005400267-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--1005400267-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--1005400267-->  <SEQNO><![CDATA[90]]></SEQNO>
 <!--1005400267-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1005400267-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1005400267-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -181797,7 +181796,7 @@
 <!--10F44D767CA9479B9061C09E0E52EA3E-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--10F44D767CA9479B9061C09E0E52EA3E-->  <DISPLAYLENGTH><![CDATA[22]]></DISPLAYLENGTH>
 <!--10F44D767CA9479B9061C09E0E52EA3E-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--10F44D767CA9479B9061C09E0E52EA3E-->  <SEQNO><![CDATA[370]]></SEQNO>
+<!--10F44D767CA9479B9061C09E0E52EA3E-->  <SEQNO><![CDATA[390]]></SEQNO>
 <!--10F44D767CA9479B9061C09E0E52EA3E-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--10F44D767CA9479B9061C09E0E52EA3E-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--10F44D767CA9479B9061C09E0E52EA3E-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -183086,7 +183085,7 @@
 <!--2CD5548FF8284700BBA81B2AA589E8AD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2CD5548FF8284700BBA81B2AA589E8AD-->  <NAME><![CDATA[Export allowed]]></NAME>
 <!--2CD5548FF8284700BBA81B2AA589E8AD-->  <DESCRIPTION><![CDATA[This data set can be exported]]></DESCRIPTION>
-<!--2CD5548FF8284700BBA81B2AA589E8AD-->  <HELP><![CDATA[This data set can be exported.]]></HELP>
+<!--2CD5548FF8284700BBA81B2AA589E8AD-->  <HELP><![CDATA[This data set can be exported. There are datasets which are not meant to be exported, such as the AD dataset (which contains the set of tables which define the Application Dictionary), or the Client dataset. If the dataset needs to be exported via the Export Dataset functionality, this check should be marked. If it's going to be used for another purpose, and its data content doesn't need to be included inside the modules, then it should be unchecked. ]]></HELP>
 <!--2CD5548FF8284700BBA81B2AA589E8AD-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--2CD5548FF8284700BBA81B2AA589E8AD-->  <AD_TAB_ID><![CDATA[C53967BA96E64FC6B2E4166A7C945168]]></AD_TAB_ID>
 <!--2CD5548FF8284700BBA81B2AA589E8AD-->  <AD_COLUMN_ID><![CDATA[7ED4235BAC474A13B9059BCE003BCAEF]]></AD_COLUMN_ID>
@@ -202167,7 +202166,7 @@
 <!--8FD498995F2BB6CBE040007F01014FBE-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--8FD498995F2BB6CBE040007F01014FBE-->  <DISPLAYLENGTH><![CDATA[10000]]></DISPLAYLENGTH>
 <!--8FD498995F2BB6CBE040007F01014FBE-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--8FD498995F2BB6CBE040007F01014FBE-->  <SEQNO><![CDATA[270]]></SEQNO>
+<!--8FD498995F2BB6CBE040007F01014FBE-->  <SEQNO><![CDATA[280]]></SEQNO>
 <!--8FD498995F2BB6CBE040007F01014FBE-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--8FD498995F2BB6CBE040007F01014FBE-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--8FD498995F2BB6CBE040007F01014FBE-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -202213,7 +202212,7 @@
 <!--8FE2B8E991C2B265E040007F01011917-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--8FE2B8E991C2B265E040007F01011917-->  <DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
 <!--8FE2B8E991C2B265E040007F01011917-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--8FE2B8E991C2B265E040007F01011917-->  <SEQNO><![CDATA[280]]></SEQNO>
+<!--8FE2B8E991C2B265E040007F01011917-->  <SEQNO><![CDATA[290]]></SEQNO>
 <!--8FE2B8E991C2B265E040007F01011917-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--8FE2B8E991C2B265E040007F01011917-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--8FE2B8E991C2B265E040007F01011917-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -202236,7 +202235,7 @@
 <!--8FE2B8E991C3B265E040007F01011917-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--8FE2B8E991C3B265E040007F01011917-->  <DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
 <!--8FE2B8E991C3B265E040007F01011917-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--8FE2B8E991C3B265E040007F01011917-->  <SEQNO><![CDATA[290]]></SEQNO>
+<!--8FE2B8E991C3B265E040007F01011917-->  <SEQNO><![CDATA[300]]></SEQNO>
 <!--8FE2B8E991C3B265E040007F01011917-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--8FE2B8E991C3B265E040007F01011917-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--8FE2B8E991C3B265E040007F01011917-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -202259,7 +202258,7 @@
 <!--8FE2B8E991C4B265E040007F01011917-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--8FE2B8E991C4B265E040007F01011917-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
 <!--8FE2B8E991C4B265E040007F01011917-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--8FE2B8E991C4B265E040007F01011917-->  <SEQNO><![CDATA[300]]></SEQNO>
+<!--8FE2B8E991C4B265E040007F01011917-->  <SEQNO><![CDATA[310]]></SEQNO>
 <!--8FE2B8E991C4B265E040007F01011917-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--8FE2B8E991C4B265E040007F01011917-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--8FE2B8E991C4B265E040007F01011917-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -202282,7 +202281,7 @@
 <!--901EC583A3D190DBE040007F0101131F-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--901EC583A3D190DBE040007F0101131F-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
 <!--901EC583A3D190DBE040007F0101131F-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--901EC583A3D190DBE040007F0101131F-->  <SEQNO><![CDATA[340]]></SEQNO>
+<!--901EC583A3D190DBE040007F0101131F-->  <SEQNO><![CDATA[350]]></SEQNO>
 <!--901EC583A3D190DBE040007F0101131F-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--901EC583A3D190DBE040007F0101131F-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--901EC583A3D190DBE040007F0101131F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -202305,7 +202304,7 @@
 <!--901EC583A3D290DBE040007F0101131F-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--901EC583A3D290DBE040007F0101131F-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
 <!--901EC583A3D290DBE040007F0101131F-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--901EC583A3D290DBE040007F0101131F-->  <SEQNO><![CDATA[310]]></SEQNO>
+<!--901EC583A3D290DBE040007F0101131F-->  <SEQNO><![CDATA[320]]></SEQNO>
 <!--901EC583A3D290DBE040007F0101131F-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--901EC583A3D290DBE040007F0101131F-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--901EC583A3D290DBE040007F0101131F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -202328,7 +202327,7 @@
 <!--901EC583A3D390DBE040007F0101131F-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--901EC583A3D390DBE040007F0101131F-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
 <!--901EC583A3D390DBE040007F0101131F-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--901EC583A3D390DBE040007F0101131F-->  <SEQNO><![CDATA[320]]></SEQNO>
+<!--901EC583A3D390DBE040007F0101131F-->  <SEQNO><![CDATA[330]]></SEQNO>
 <!--901EC583A3D390DBE040007F0101131F-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--901EC583A3D390DBE040007F0101131F-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--901EC583A3D390DBE040007F0101131F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -202351,7 +202350,7 @@
 <!--901EFB5F463074B6E040007F01011A16-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--901EFB5F463074B6E040007F01011A16-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
 <!--901EFB5F463074B6E040007F01011A16-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--901EFB5F463074B6E040007F01011A16-->  <SEQNO><![CDATA[330]]></SEQNO>
+<!--901EFB5F463074B6E040007F01011A16-->  <SEQNO><![CDATA[340]]></SEQNO>
 <!--901EFB5F463074B6E040007F01011A16-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--901EFB5F463074B6E040007F01011A16-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--901EFB5F463074B6E040007F01011A16-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -202395,7 +202394,7 @@
 <!--90211BA56ACAD8A1E040007F01012508-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--90211BA56ACAD8A1E040007F01012508-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
 <!--90211BA56ACAD8A1E040007F01012508-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--90211BA56ACAD8A1E040007F01012508-->  <SEQNO><![CDATA[350]]></SEQNO>
+<!--90211BA56ACAD8A1E040007F01012508-->  <SEQNO><![CDATA[370]]></SEQNO>
 <!--90211BA56ACAD8A1E040007F01012508-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--90211BA56ACAD8A1E040007F01012508-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--90211BA56ACAD8A1E040007F01012508-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -202418,7 +202417,7 @@
 <!--90211BA56ACBD8A1E040007F01012508-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--90211BA56ACBD8A1E040007F01012508-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
 <!--90211BA56ACBD8A1E040007F01012508-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--90211BA56ACBD8A1E040007F01012508-->  <SEQNO><![CDATA[360]]></SEQNO>
+<!--90211BA56ACBD8A1E040007F01012508-->  <SEQNO><![CDATA[380]]></SEQNO>
 <!--90211BA56ACBD8A1E040007F01012508-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--90211BA56ACBD8A1E040007F01012508-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--90211BA56ACBD8A1E040007F01012508-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -203172,7 +203171,7 @@
 <!--92176D0397F597A2E040007F01013057-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--92176D0397F597A2E040007F01013057-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
 <!--92176D0397F597A2E040007F01013057-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--92176D0397F597A2E040007F01013057-->  <SEQNO><![CDATA[260]]></SEQNO>
+<!--92176D0397F597A2E040007F01013057-->  <SEQNO><![CDATA[270]]></SEQNO>
 <!--92176D0397F597A2E040007F01013057-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--92176D0397F597A2E040007F01013057-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--92176D0397F597A2E040007F01013057-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -203262,7 +203261,7 @@
 <!--92FC7D0E63E80A15E040007F0100490C-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--92FC7D0E63E80A15E040007F0100490C-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
 <!--92FC7D0E63E80A15E040007F0100490C-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--92FC7D0E63E80A15E040007F0100490C-->  <SEQNO><![CDATA[200]]></SEQNO>
+<!--92FC7D0E63E80A15E040007F0100490C-->  <SEQNO><![CDATA[210]]></SEQNO>
 <!--92FC7D0E63E80A15E040007F0100490C-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--92FC7D0E63E80A15E040007F0100490C-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--92FC7D0E63E80A15E040007F0100490C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -203294,6 +203293,28 @@
 <!--93092ACE16BA46B8B0C7AA66DCAF80BE-->  <GRID_SEQNO><![CDATA[20]]></GRID_SEQNO>
 <!--93092ACE16BA46B8B0C7AA66DCAF80BE--></AD_FIELD>
 
+<!--9397E028904B4B43E040007F0100749D--><AD_FIELD>
+<!--9397E028904B4B43E040007F0100749D-->  <AD_FIELD_ID><![CDATA[9397E028904B4B43E040007F0100749D]]></AD_FIELD_ID>
+<!--9397E028904B4B43E040007F0100749D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9397E028904B4B43E040007F0100749D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9397E028904B4B43E040007F0100749D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9397E028904B4B43E040007F0100749D-->  <NAME><![CDATA[Rejected logins due to concurrent users limit]]></NAME>
+<!--9397E028904B4B43E040007F0100749D-->  <HELP><![CDATA[Number of rejected logins due to concurrent users limit on the last 30 days]]></HELP>
+<!--9397E028904B4B43E040007F0100749D-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--9397E028904B4B43E040007F0100749D-->  <AD_TAB_ID><![CDATA[1005400006]]></AD_TAB_ID>
+<!--9397E028904B4B43E040007F0100749D-->  <AD_COLUMN_ID><![CDATA[9397E02890414B43E040007F0100749D]]></AD_COLUMN_ID>
+<!--9397E028904B4B43E040007F0100749D-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--9397E028904B4B43E040007F0100749D-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
+<!--9397E028904B4B43E040007F0100749D-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--9397E028904B4B43E040007F0100749D-->  <SEQNO><![CDATA[360]]></SEQNO>
+<!--9397E028904B4B43E040007F0100749D-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--9397E028904B4B43E040007F0100749D-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--9397E028904B4B43E040007F0100749D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9397E028904B4B43E040007F0100749D-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--9397E028904B4B43E040007F0100749D-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--9397E028904B4B43E040007F0100749D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9397E028904B4B43E040007F0100749D--></AD_FIELD>
+
 <!--9548BFF12C804E3EAC9954731D5A4177--><AD_FIELD>
 <!--9548BFF12C804E3EAC9954731D5A4177-->  <AD_FIELD_ID><![CDATA[9548BFF12C804E3EAC9954731D5A4177]]></AD_FIELD_ID>
 <!--9548BFF12C804E3EAC9954731D5A4177-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -204251,7 +204272,7 @@
 <!--AFCAC02426F149D0B1F71C6923057A5E-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--AFCAC02426F149D0B1F71C6923057A5E-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
 <!--AFCAC02426F149D0B1F71C6923057A5E-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--AFCAC02426F149D0B1F71C6923057A5E-->  <SEQNO><![CDATA[210]]></SEQNO>
+<!--AFCAC02426F149D0B1F71C6923057A5E-->  <SEQNO><![CDATA[200]]></SEQNO>
 <!--AFCAC02426F149D0B1F71C6923057A5E-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--AFCAC02426F149D0B1F71C6923057A5E-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--AFCAC02426F149D0B1F71C6923057A5E-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -204443,6 +204464,29 @@
 <!--B69E1F6A0B104339B0FDAB3F65C905EB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--B69E1F6A0B104339B0FDAB3F65C905EB--></AD_FIELD>
 
+<!--B6AA3AAEE159453681A0409D62019B3B--><AD_FIELD>
+<!--B6AA3AAEE159453681A0409D62019B3B-->  <AD_FIELD_ID><![CDATA[B6AA3AAEE159453681A0409D62019B3B]]></AD_FIELD_ID>
+<!--B6AA3AAEE159453681A0409D62019B3B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B6AA3AAEE159453681A0409D62019B3B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B6AA3AAEE159453681A0409D62019B3B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B6AA3AAEE159453681A0409D62019B3B-->  <NAME><![CDATA[Instance Number]]></NAME>
+<!--B6AA3AAEE159453681A0409D62019B3B-->  <DESCRIPTION><![CDATA[Professional Edition Instance Number]]></DESCRIPTION>
+<!--B6AA3AAEE159453681A0409D62019B3B-->  <HELP><![CDATA[Each Professional Edition license can activate multiple instances, this number is an identifier for each of the instances registered for the current license.]]></HELP>
+<!--B6AA3AAEE159453681A0409D62019B3B-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--B6AA3AAEE159453681A0409D62019B3B-->  <AD_TAB_ID><![CDATA[1005400006]]></AD_TAB_ID>
+<!--B6AA3AAEE159453681A0409D62019B3B-->  <AD_COLUMN_ID><![CDATA[6FBE5F4BF5294BD788767799EBEF47EF]]></AD_COLUMN_ID>
+<!--B6AA3AAEE159453681A0409D62019B3B-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--B6AA3AAEE159453681A0409D62019B3B-->  <DISPLAYLENGTH><![CDATA[3]]></DISPLAYLENGTH>
+<!--B6AA3AAEE159453681A0409D62019B3B-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--B6AA3AAEE159453681A0409D62019B3B-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--B6AA3AAEE159453681A0409D62019B3B-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
+<!--B6AA3AAEE159453681A0409D62019B3B-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--B6AA3AAEE159453681A0409D62019B3B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B6AA3AAEE159453681A0409D62019B3B-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--B6AA3AAEE159453681A0409D62019B3B-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--B6AA3AAEE159453681A0409D62019B3B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B6AA3AAEE159453681A0409D62019B3B--></AD_FIELD>
+
 <!--B885A9283E044499BFE5DCF12AAD72C5--><AD_FIELD>
 <!--B885A9283E044499BFE5DCF12AAD72C5-->  <AD_FIELD_ID><![CDATA[B885A9283E044499BFE5DCF12AAD72C5]]></AD_FIELD_ID>
 <!--B885A9283E044499BFE5DCF12AAD72C5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_MESSAGE.xml	Thu Nov 04 21:11:37 2010 +0100
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml	Fri Nov 05 11:44:01 2010 +0000
@@ -28013,8 +28013,8 @@
 <!--1005800002-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--1005800002-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--1005800002-->  <VALUE><![CDATA[HB_WELCOME]]></VALUE>
-<!--1005800002-->  <MSGTEXT><![CDATA[To help us improve the software quality and understand its worldwide usage, we invite you to enable the Heartbeat. This tool periodically sends to Openbravo anonymous updates regarding your technical system specifications (e.g. operating system, database, Openbravo version, etc.). Enabling the Heartbeat is required to access additional services provided by Openbravo, such as the ability to download and install extension modules. For a full description of the information transmitted to Openbravo, see the Heartbeat Configuration chapter of the User Manual.
-http://wiki.openbravo.com/wiki/ERP/2.50/User_Manual/HeartBeat
+<!--1005800002-->  <MSGTEXT><![CDATA[To help us improve the software quality and understand its worldwide usage, we invite you to enable the Heartbeat. This tool periodically sends to Openbravo anonymous updates regarding your technical system specifications (e.g. operating system, database, Openbravo version, etc.). Enabling the Heartbeat is required to access additional services provided by Openbravo, such as the ability to download and install extension modules. For a full description of the information transmitted to Openbravo, see the <a href='http://wiki.openbravo.com/wiki/ERP/2.50/User_Manual/HeartBeat' target='_blank' class='LabelLink'>Heartbeat Configuration</a> chapter of the User Manual.
+
 
 
 Do you want to enable the Heartbeat?]]></MSGTEXT>
@@ -29542,6 +29542,17 @@
 <!--01C801B95D4A44E2956F9057C7E38A6A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--01C801B95D4A44E2956F9057C7E38A6A--></AD_MESSAGE>
 
+<!--02758CBBA66D42108380E648EF7C026E--><AD_MESSAGE>
+<!--02758CBBA66D42108380E648EF7C026E-->  <AD_MESSAGE_ID><![CDATA[02758CBBA66D42108380E648EF7C026E]]></AD_MESSAGE_ID>
+<!--02758CBBA66D42108380E648EF7C026E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--02758CBBA66D42108380E648EF7C026E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--02758CBBA66D42108380E648EF7C026E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--02758CBBA66D42108380E648EF7C026E-->  <VALUE><![CDATA[NoConversionDayUom]]></VALUE>
+<!--02758CBBA66D42108380E648EF7C026E-->  <MSGTEXT><![CDATA[There is no Conversion Rate defined for Day to Hour.]]></MSGTEXT>
+<!--02758CBBA66D42108380E648EF7C026E-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--02758CBBA66D42108380E648EF7C026E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--02758CBBA66D42108380E648EF7C026E--></AD_MESSAGE>
+
 <!--03C7B58E00F246E7BA06D153B3DB2D5B--><AD_MESSAGE>
 <!--03C7B58E00F246E7BA06D153B3DB2D5B-->  <AD_MESSAGE_ID><![CDATA[03C7B58E00F246E7BA06D153B3DB2D5B]]></AD_MESSAGE_ID>
 <!--03C7B58E00F246E7BA06D153B3DB2D5B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -30288,6 +30299,17 @@
 <!--272961BF12DB4930A0F8EDDADE8827CA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--272961BF12DB4930A0F8EDDADE8827CA--></AD_MESSAGE>
 
+<!--27D70A51233E44C9B1319F3BE1453507--><AD_MESSAGE>
+<!--27D70A51233E44C9B1319F3BE1453507-->  <AD_MESSAGE_ID><![CDATA[27D70A51233E44C9B1319F3BE1453507]]></AD_MESSAGE_ID>
+<!--27D70A51233E44C9B1319F3BE1453507-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--27D70A51233E44C9B1319F3BE1453507-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--27D70A51233E44C9B1319F3BE1453507-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--27D70A51233E44C9B1319F3BE1453507-->  <VALUE><![CDATA[Home_Purpose_Tooltip]]></VALUE>
+<!--27D70A51233E44C9B1319F3BE1453507-->  <MSGTEXT><![CDATA[Instance purpose is unknown.]]></MSGTEXT>
+<!--27D70A51233E44C9B1319F3BE1453507-->  <MSGTYPE><![CDATA[C]]></MSGTYPE>
+<!--27D70A51233E44C9B1319F3BE1453507-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--27D70A51233E44C9B1319F3BE1453507--></AD_MESSAGE>
+
 <!--29C3C655E5394359B44C086A5D8B5C15--><AD_MESSAGE>
 <!--29C3C655E5394359B44C086A5D8B5C15-->  <AD_MESSAGE_ID><![CDATA[29C3C655E5394359B44C086A5D8B5C15]]></AD_MESSAGE_ID>
 <!--29C3C655E5394359B44C086A5D8B5C15-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -30993,8 +31015,7 @@
 
 Thank you for downloading and supporting our open source ERP.
 
-Since this is the first time that you login, please select the purpose of this instance. Learn more:
-http://wiki.openbravo.com/wiki/ERP/2.50/Configuration_Manual/Getting_started#Configuring_the_Instance_Purpose]]></MSGTEXT>
+Since this is the first time that you login, please select the purpose of this instance. <a href='http://wiki.openbravo.com/wiki/ERP/2.50/Configuration_Manual/Getting_started#Configuring_the_Instance_Purpose' target='_blank' class='LabelLink'>Learn more</a>]]></MSGTEXT>
 <!--5319728ED743474AA75BB9BBF8F08321-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
 <!--5319728ED743474AA75BB9BBF8F08321-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--5319728ED743474AA75BB9BBF8F08321--></AD_MESSAGE>
--- a/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 04 21:11:37 2010 +0100
+++ b/src-db/database/sourcedata/AD_MODULE.xml	Fri Nov 05 11:44:01 2010 +0000
@@ -6,7 +6,7 @@
 <!--0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0-->  <NAME><![CDATA[Core]]></NAME>
-<!--0-->  <VERSION><![CDATA[2.50.18778]]></VERSION>
+<!--0-->  <VERSION><![CDATA[2.50.18836]]></VERSION>
 <!--0-->  <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION>
 <!--0-->  <HELP><![CDATA[Core module is the base one, all developments in core are included as part of the standard Openbravo ERP.]]></HELP>
 <!--0-->  <URL><![CDATA[www.openbravo.com]]></URL>
@@ -22,7 +22,7 @@
 <!--0-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--0-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
 <!--0-->  <REFERENCEDATAINFO><![CDATA[Standard document types for orders, invoices, etc. and settings]]></REFERENCEDATAINFO>
-<!--0-->  <VERSION_LABEL><![CDATA[MP23]]></VERSION_LABEL>
+<!--0-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--0-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0--></AD_MODULE>
 
--- a/src-db/database/sourcedata/AD_PROCESS.xml	Thu Nov 04 21:11:37 2010 +0100
+++ b/src-db/database/sourcedata/AD_PROCESS.xml	Fri Nov 05 11:44:01 2010 +0000
@@ -1232,13 +1232,14 @@
 <!--176-->  <NAME><![CDATA[Reset Accounting]]></NAME>
 <!--176-->  <DESCRIPTION><![CDATA[Reset Accounting Entries]]></DESCRIPTION>
 <!--176-->  <HELP><![CDATA[Delete accounting records of documents to be re-created by the next run of the accounting engine.  This is a dramatic step and you want to do this ONLY after changes of the accounting structure (e.g. different default accounts, etc.) and if fixing via man]]></HELP>
-<!--176-->  <ACCESSLEVEL><![CDATA[6]]></ACCESSLEVEL>
+<!--176-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
 <!--176-->  <ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
 <!--176-->  <PROCEDURENAME><![CDATA[Fact_Acct_Reset]]></PROCEDURENAME>
 <!--176-->  <ISREPORT><![CDATA[N]]></ISREPORT>
 <!--176-->  <ISDIRECTPRINT><![CDATA[N]]></ISDIRECTPRINT>
 <!--176-->  <ISBACKGROUND><![CDATA[N]]></ISBACKGROUND>
 <!--176-->  <ISJASPER><![CDATA[N]]></ISJASPER>
+<!--176-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--176-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--176-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
 <!--176--></AD_PROCESS>
@@ -3371,7 +3372,7 @@
 <!--800085-->  <DESCRIPTION><![CDATA[Generates raw materials average costs.]]></DESCRIPTION>
 <!--800085-->  <HELP><![CDATA[Using the previous raw material receipts, calculates its medium cost.<br>
 The product price of each receipt is calculated based on the on the product price in the purchase invoice. If the invoice does not exist the price of the purchase order is used, if the order neither exists the price list of the provider is used. If none of these criterias exist, a warning is generated and the previous cost is used.]]></HELP>
-<!--800085-->  <ACCESSLEVEL><![CDATA[7]]></ACCESSLEVEL>
+<!--800085-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
 <!--800085-->  <ISUSERSTARTABLE><![CDATA[Y]]></ISUSERSTARTABLE>
 <!--800085-->  <PROCEDURENAME><![CDATA[M_Generate_Average_Costs]]></PROCEDURENAME>
 <!--800085-->  <ISREPORT><![CDATA[N]]></ISREPORT>
@@ -4306,7 +4307,7 @@
 <!--800144-->  <NAME><![CDATA[User Defined Accounting Report]]></NAME>
 <!--800144-->  <DESCRIPTION><![CDATA[Selects an accounting model to obtain its report.]]></DESCRIPTION>
 <!--800144-->  <HELP><![CDATA[Selects an accounting model to obtain its report.]]></HELP>
-<!--800144-->  <ACCESSLEVEL><![CDATA[6]]></ACCESSLEVEL>
+<!--800144-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
 <!--800144-->  <ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
 <!--800144-->  <ISREPORT><![CDATA[N]]></ISREPORT>
 <!--800144-->  <ISDIRECTPRINT><![CDATA[N]]></ISDIRECTPRINT>
@@ -4747,13 +4748,14 @@
 <!--800172-->  <NAME><![CDATA[Sales Report by Partner and Product]]></NAME>
 <!--800172-->  <DESCRIPTION><![CDATA[Report Sales by partner and Product]]></DESCRIPTION>
 <!--800172-->  <HELP><![CDATA[Report Sales by partner and Product]]></HELP>
-<!--800172-->  <ACCESSLEVEL><![CDATA[7]]></ACCESSLEVEL>
+<!--800172-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
 <!--800172-->  <ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
 <!--800172-->  <ISREPORT><![CDATA[Y]]></ISREPORT>
 <!--800172-->  <ISDIRECTPRINT><![CDATA[N]]></ISDIRECTPRINT>
 <!--800172-->  <ISBACKGROUND><![CDATA[N]]></ISBACKGROUND>
 <!--800172-->  <ISJASPER><![CDATA[Y]]></ISJASPER>
 <!--800172-->  <JRNAME><![CDATA[@basedesign@/org/openbravo/erpCommon/ad_reports/ReportSalesPartnerProduct.jrxml]]></JRNAME>
+<!--800172-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--800172-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800172-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
 <!--800172--></AD_PROCESS>
@@ -4767,12 +4769,13 @@
 <!--800173-->  <NAME><![CDATA[Production Run Status Report]]></NAME>
 <!--800173-->  <DESCRIPTION><![CDATA[Production Run Status Report]]></DESCRIPTION>
 <!--800173-->  <HELP><![CDATA[Production Run Status Report JR]]></HELP>
-<!--800173-->  <ACCESSLEVEL><![CDATA[7]]></ACCESSLEVEL>
+<!--800173-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
 <!--800173-->  <ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
 <!--800173-->  <ISREPORT><![CDATA[Y]]></ISREPORT>
 <!--800173-->  <ISDIRECTPRINT><![CDATA[N]]></ISDIRECTPRINT>
 <!--800173-->  <ISBACKGROUND><![CDATA[N]]></ISBACKGROUND>
 <!--800173-->  <ISJASPER><![CDATA[N]]></ISJASPER>
+<!--800173-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--800173-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800173-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--800173--></AD_PROCESS>
@@ -4786,12 +4789,13 @@
 <!--800174-->  <NAME><![CDATA[Production Report]]></NAME>
 <!--800174-->  <DESCRIPTION><![CDATA[Report Production]]></DESCRIPTION>
 <!--800174-->  <HELP><![CDATA[Report Production]]></HELP>
-<!--800174-->  <ACCESSLEVEL><![CDATA[7]]></ACCESSLEVEL>
+<!--800174-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
 <!--800174-->  <ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
 <!--800174-->  <ISREPORT><![CDATA[Y]]></ISREPORT>
 <!--800174-->  <ISDIRECTPRINT><![CDATA[N]]></ISDIRECTPRINT>
 <!--800174-->  <ISBACKGROUND><![CDATA[N]]></ISBACKGROUND>
 <!--800174-->  <ISJASPER><![CDATA[N]]></ISJASPER>
+<!--800174-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--800174-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800174-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--800174--></AD_PROCESS>
@@ -4805,7 +4809,7 @@
 <!--800175-->  <NAME><![CDATA[Customer Invoice Report]]></NAME>
 <!--800175-->  <DESCRIPTION><![CDATA[Customer Invoice Report]]></DESCRIPTION>
 <!--800175-->  <HELP><![CDATA[Customer Invoice Report JR]]></HELP>
-<!--800175-->  <ACCESSLEVEL><![CDATA[7]]></ACCESSLEVEL>
+<!--800175-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
 <!--800175-->  <ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
 <!--800175-->  <ISREPORT><![CDATA[Y]]></ISREPORT>
 <!--800175-->  <ISDIRECTPRINT><![CDATA[N]]></ISDIRECTPRINT>
@@ -4825,12 +4829,13 @@
 <!--800176-->  <NAME><![CDATA[Sales Order Report]]></NAME>
 <!--800176-->  <DESCRIPTION><![CDATA[Sales Order Report]]></DESCRIPTION>
 <!--800176-->  <HELP><![CDATA[Sales Order Report JR]]></HELP>
-<!--800176-->  <ACCESSLEVEL><![CDATA[7]]></ACCESSLEVEL>
+<!--800176-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
 <!--800176-->  <ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
 <!--800176-->  <ISREPORT><![CDATA[Y]]></ISREPORT>
 <!--800176-->  <ISDIRECTPRINT><![CDATA[N]]></ISDIRECTPRINT>
 <!--800176-->  <ISBACKGROUND><![CDATA[N]]></ISBACKGROUND>
 <!--800176-->  <ISJASPER><![CDATA[N]]></ISJASPER>
+<!--800176-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--800176-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800176-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--800176--></AD_PROCESS>
@@ -4863,12 +4868,13 @@
 <!--800178-->  <NAME><![CDATA[Orders Awaiting Invoice Report]]></NAME>
 <!--800178-->  <DESCRIPTION><![CDATA[Orders Awaiting Invoice Report]]></DESCRIPTION>
 <!--800178-->  <HELP><![CDATA[Orders Awaiting Invoice Report JR]]></HELP>
-<!--800178-->  <ACCESSLEVEL><![CDATA[7]]></ACCESSLEVEL>
+<!--800178-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
 <!--800178-->  <ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
 <!--800178-->  <ISREPORT><![CDATA[Y]]></ISREPORT>
 <!--800178-->  <ISDIRECTPRINT><![CDATA[N]]></ISDIRECTPRINT>
 <!--800178-->  <ISBACKGROUND><![CDATA[N]]></ISBACKGROUND>
 <!--800178-->  <ISJASPER><![CDATA[N]]></ISJASPER>
+<!--800178-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--800178-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800178-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--800178--></AD_PROCESS>
@@ -4882,12 +4888,13 @@
 <!--800179-->  <NAME><![CDATA[Expiration Date Report]]></NAME>
 <!--800179-->  <DESCRIPTION><![CDATA[Expiration Date Report]]></DESCRIPTION>
 <!--800179-->  <HELP><![CDATA[Expiration Date Report JR]]></HELP>
-<!--800179-->  <ACCESSLEVEL><![CDATA[7]]></ACCESSLEVEL>
+<!--800179-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
 <!--800179-->  <ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
 <!--800179-->  <ISREPORT><![CDATA[Y]]></ISREPORT>
 <!--800179-->  <ISDIRECTPRINT><![CDATA[N]]></ISDIRECTPRINT>
 <!--800179-->  <ISBACKGROUND><![CDATA[N]]></ISBACKGROUND>
 <!--800179-->  <ISJASPER><![CDATA[N]]></ISJASPER>
+<!--800179-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--800179-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800179-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--800179--></AD_PROCESS>
@@ -4901,12 +4908,13 @@
 <!--800180-->  <NAME><![CDATA[Vendor Invoice Report]]></NAME>
 <!--800180-->  <DESCRIPTION><![CDATA[Report Invoice Vendor]]></DESCRIPTION>
 <!--800180-->  <HELP><![CDATA[Report Invoice Vendor JR]]></HELP>
-<!--800180-->  <ACCESSLEVEL><![CDATA[7]]></ACCESSLEVEL>
+<!--800180-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
 <!--800180-->  <ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
 <!--800180-->  <ISREPORT><![CDATA[Y]]></ISREPORT>
 <!--800180-->  <ISDIRECTPRINT><![CDATA[N]]></ISDIRECTPRINT>
 <!--800180-->  <ISBACKGROUND><![CDATA[N]]></ISBACKGROUND>
 <!--800180-->  <ISJASPER><![CDATA[N]]></ISJASPER>
+<!--800180-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--800180-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800180-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--800180--></AD_PROCESS>
@@ -5054,12 +5062,13 @@
 <!--800189-->  <NAME><![CDATA[Shipment Report]]></NAME>
 <!--800189-->  <DESCRIPTION><![CDATA[Shipment Report]]></DESCRIPTION>
 <!--800189-->  <HELP><![CDATA[Shipment Report JR]]></HELP>
-<!--800189-->  <ACCESSLEVEL><![CDATA[7]]></ACCESSLEVEL>
+<!--800189-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
 <!--800189-->  <ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
 <!--800189-->  <ISREPORT><![CDATA[Y]]></ISREPORT>
 <!--800189-->  <ISDIRECTPRINT><![CDATA[N]]></ISDIRECTPRINT>
 <!--800189-->  <ISBACKGROUND><![CDATA[N]]></ISBACKGROUND>
 <!--800189-->  <ISJASPER><![CDATA[N]]></ISJASPER>
+<!--800189-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--800189-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800189-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--800189--></AD_PROCESS>
@@ -5073,12 +5082,13 @@
 <!--800190-->  <NAME><![CDATA[Invoiced Sales Order Report]]></NAME>
 <!--800190-->  <DESCRIPTION><![CDATA[Invoiced Sales Order Report]]></DESCRIPTION>
 <!--800190-->  <HELP><![CDATA[Invoiced Sales Order Report JR]]></HELP>
-<!--800190-->  <ACCESSLEVEL><![CDATA[7]]></ACCESSLEVEL>
+<!--800190-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
 <!--800190-->  <ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
 <!--800190-->  <ISREPORT><![CDATA[Y]]></ISREPORT>
 <!--800190-->  <ISDIRECTPRINT><![CDATA[N]]></ISDIRECTPRINT>
 <!--800190-->  <ISBACKGROUND><![CDATA[N]]></ISBACKGROUND>
 <!--800190-->  <ISJASPER><![CDATA[N]]></ISJASPER>
+<!--800190-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--800190-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800190-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--800190--></AD_PROCESS>
@@ -5111,12 +5121,13 @@
 <!--800192-->  <NAME><![CDATA[Delivered Sales Order Report]]></NAME>
 <!--800192-->  <DESCRIPTION><![CDATA[Delivered Sales Order Report]]></DESCRIPTION>
 <!--800192-->  <HELP><![CDATA[Delivered Sales Order Report JR]]></HELP>
-<!--800192-->  <ACCESSLEVEL><![CDATA[7]]></ACCESSLEVEL>
+<!--800192-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
 <!--800192-->  <ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
 <!--800192-->  <ISREPORT><![CDATA[Y]]></ISREPORT>
 <!--800192-->  <ISDIRECTPRINT><![CDATA[N]]></ISDIRECTPRINT>
 <!--800192-->  <ISBACKGROUND><![CDATA[N]]></ISBACKGROUND>
 <!--800192-->  <ISJASPER><![CDATA[N]]></ISJASPER>
+<!--800192-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--800192-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800192-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--800192--></AD_PROCESS>
@@ -5187,12 +5198,13 @@
 <!--800197-->  <NAME><![CDATA[Daily Work Requirements Report]]></NAME>
 <!--800197-->  <DESCRIPTION><![CDATA[In this report are showed the work requirements of type ramp. By default only from actual date.]]></DESCRIPTION>
 <!--800197-->  <HELP><![CDATA[In this report are showed the work requirements of type ramp. By default only from actual date.]]></HELP>
-<!--800197-->  <ACCESSLEVEL><![CDATA[7]]></ACCESSLEVEL>
+<!--800197-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
 <!--800197-->  <ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
 <!--800197-->  <ISREPORT><![CDATA[Y]]></ISREPORT>
 <!--800197-->  <ISDIRECTPRINT><![CDATA[N]]></ISDIRECTPRINT>
 <!--800197-->  <ISBACKGROUND><![CDATA[N]]></ISBACKGROUND>
 <!--800197-->  <ISJASPER><![CDATA[N]]></ISJASPER>
+<!--800197-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--800197-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800197-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--800197--></AD_PROCESS>
--- a/src-db/database/sourcedata/AD_TAB.xml	Thu Nov 04 21:11:37 2010 +0100
+++ b/src-db/database/sourcedata/AD_TAB.xml	Fri Nov 05 11:44:01 2010 +0000
@@ -1621,6 +1621,7 @@
 <!--186-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
 <!--186-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--186-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
+<!--186-->  <HQLWHERECLAUSE><![CDATA[salesTransaction=true]]></HQLWHERECLAUSE>
 <!--186--></AD_TAB>
 
 <!--187--><AD_TAB>
@@ -2487,6 +2488,7 @@
 <!--236-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
 <!--236-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--236-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
+<!--236-->  <HQLORDERBYCLAUSE><![CDATA[lineNo]]></HQLORDERBYCLAUSE>
 <!--236--></AD_TAB>
 
 <!--237--><AD_TAB>
@@ -3328,6 +3330,7 @@
 <!--294-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
 <!--294-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--294-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
+<!--294-->  <HQLWHERECLAUSE><![CDATA[salesTransaction=false]]></HQLWHERECLAUSE>
 <!--294--></AD_TAB>
 
 <!--295--><AD_TAB>
@@ -3352,6 +3355,7 @@
 <!--295-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
 <!--295-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--295-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
+<!--295-->  <HQLORDERBYCLAUSE><![CDATA[lineNo]]></HQLORDERBYCLAUSE>
 <!--295--></AD_TAB>
 
 <!--296--><AD_TAB>
@@ -12644,6 +12648,7 @@
 <!--25C70617A7964B479BDA71197E7E88E9-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
 <!--25C70617A7964B479BDA71197E7E88E9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--25C70617A7964B479BDA71197E7E88E9-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
+<!--25C70617A7964B479BDA71197E7E88E9-->  <HQLORDERBYCLAUSE><![CDATA[lineNo]]></HQLORDERBYCLAUSE>
 <!--25C70617A7964B479BDA71197E7E88E9--></AD_TAB>
 
 <!--27456D8A387F4580B30EA784C63831BB--><AD_TAB>
@@ -13522,6 +13527,7 @@
 <!--ADBD1719BFA14C97A32C7B6E8452D14F-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
 <!--ADBD1719BFA14C97A32C7B6E8452D14F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--ADBD1719BFA14C97A32C7B6E8452D14F-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
+<!--ADBD1719BFA14C97A32C7B6E8452D14F-->  <HQLORDERBYCLAUSE><![CDATA[lineNo]]></HQLORDERBYCLAUSE>
 <!--ADBD1719BFA14C97A32C7B6E8452D14F--></AD_TAB>
 
 <!--B30CF79CF71245339E94B4B332BAABF1--><AD_TAB>
--- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Thu Nov 04 21:11:37 2010 +0100
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Fri Nov 05 11:44:01 2010 +0000
@@ -21120,17 +21120,6 @@
 <!--91EFCD58CF2021D7E040007F0100314C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--91EFCD58CF2021D7E040007F0100314C--></AD_TEXTINTERFACES>
 
-<!--920934443FE058FBE040007F0100124B--><AD_TEXTINTERFACES>
-<!--920934443FE058FBE040007F0100124B-->  <AD_TEXTINTERFACES_ID><![CDATA[920934443FE058FBE040007F0100124B]]></AD_TEXTINTERFACES_ID>
-<!--920934443FE058FBE040007F0100124B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--920934443FE058FBE040007F0100124B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--920934443FE058FBE040007F0100124B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--920934443FE058FBE040007F0100124B-->  <TEXT><![CDATA[You must select purpose]]></TEXT>
-<!--920934443FE058FBE040007F0100124B-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstancePurpose.html]]></FILENAME>
-<!--920934443FE058FBE040007F0100124B-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--920934443FE058FBE040007F0100124B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--920934443FE058FBE040007F0100124B--></AD_TEXTINTERFACES>
-
 <!--9249205697BC413FB680A90F9784D501--><AD_TEXTINTERFACES>
 <!--9249205697BC413FB680A90F9784D501-->  <AD_TEXTINTERFACES_ID><![CDATA[9249205697BC413FB680A90F9784D501]]></AD_TEXTINTERFACES_ID>
 <!--9249205697BC413FB680A90F9784D501-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21406,6 +21395,17 @@
 <!--93871158F2B811DDADFC001D09C4A2FE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--93871158F2B811DDADFC001D09C4A2FE--></AD_TEXTINTERFACES>
 
+<!--93AE8790C6A45EF7E040007F010073E2--><AD_TEXTINTERFACES>
+<!--93AE8790C6A45EF7E040007F010073E2-->  <AD_TEXTINTERFACES_ID><![CDATA[93AE8790C6A45EF7E040007F010073E2]]></AD_TEXTINTERFACES_ID>
+<!--93AE8790C6A45EF7E040007F010073E2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--93AE8790C6A45EF7E040007F010073E2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--93AE8790C6A45EF7E040007F010073E2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--93AE8790C6A45EF7E040007F010073E2-->  <TEXT><![CDATA[You must select a purpose]]></TEXT>
+<!--93AE8790C6A45EF7E040007F010073E2-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstancePurpose.html]]></FILENAME>
+<!--93AE8790C6A45EF7E040007F010073E2-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--93AE8790C6A45EF7E040007F010073E2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--93AE8790C6A45EF7E040007F010073E2--></AD_TEXTINTERFACES>
+
 <!--9F0C2175AC6145B49570E24110762368--><AD_TEXTINTERFACES>
 <!--9F0C2175AC6145B49570E24110762368-->  <AD_TEXTINTERFACES_ID><![CDATA[9F0C2175AC6145B49570E24110762368]]></AD_TEXTINTERFACES_ID>
 <!--9F0C2175AC6145B49570E24110762368-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/referencedData/AD_ALERTRULE.xml	Thu Nov 04 21:11:37 2010 +0100
+++ b/src-db/database/sourcedata/referencedData/AD_ALERTRULE.xml	Fri Nov 05 11:44:01 2010 +0000
@@ -464,10 +464,10 @@
        m_product_org po
 where p.m_product_id = po.m_product_id
   and po.stockmin is not null
-  and po.stockmin > (select sum(qtyonhand) as QtyStored
-                       from m_storage_detail s
-                       where s.m_product_id = po.m_product_id
-                        and ad_isOrgIncluded(s.ad_org_id,po.ad_org_id,po.ad_client_id) <> -1)]]></SQL>
+  and po.stockmin > coalesce((select sum(qtyonhand) as QtyStored
+                       from m_storage_detail s
+                       where s.m_product_id = po.m_product_id
+                        and ad_isOrgIncluded(s.ad_org_id,po.ad_org_id,po.ad_client_id) <> -1), 0)]]></SQL>
 <!--1000020-->  <TYPE><![CDATA[D]]></TYPE>
 <!--1000020--></AD_ALERTRULE>
 
--- a/src-test/org/openbravo/test/dal/IssuesTest.java	Thu Nov 04 21:11:37 2010 +0100
+++ b/src-test/org/openbravo/test/dal/IssuesTest.java	Fri Nov 05 11:44:01 2010 +0000
@@ -114,6 +114,9 @@
  * https://issues.openbravo.com/view.php?id=14276: Need feature to disable maintaining audit info
  * via dal for one request/dal-session
  * 
+ * https://issues.openbravo.com/view.php?id=15050: OBQuery: whereclause with alias with a comma
+ * direct after the alias fails
+ * 
  * @author mtaal
  * @author iperdomo
  */
@@ -530,4 +533,15 @@
       assertFalse(table.getUpdated().getTime() == oldUpdated.getTime());
     }
   }
+
+  /**
+   * https://issues.openbravo.com/view.php?id=15050: OBQuery: whereclause with alias with a comma
+   * direct after the alias fails
+   */
+  public void test15050() throws Exception {
+    setSystemAdministratorContext();
+    final String whereClause = " as t, ADColumn as c where c.table = t and c.keyColumn=true";
+    final OBQuery<Table> tables = OBDal.getInstance().createQuery(Table.class, whereClause);
+    assertTrue(tables.list().size() > 0);
+  }
 }
\ No newline at end of file
--- a/src-test/org/openbravo/test/dal/ViewTest.java	Thu Nov 04 21:11:37 2010 +0100
+++ b/src-test/org/openbravo/test/dal/ViewTest.java	Fri Nov 05 11:44:01 2010 +0000
@@ -22,7 +22,10 @@
 import org.openbravo.base.model.Entity;
 import org.openbravo.base.model.ModelProvider;
 import org.openbravo.base.structure.BaseOBObject;
+import org.openbravo.dal.core.DalUtil;
+import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
+import org.openbravo.model.materialmgmt.transaction.ShipmentInOut;
 import org.openbravo.test.base.BaseTest;
 
 /**
@@ -49,4 +52,25 @@
     assertTrue(cnt > 0);
     System.err.println(cnt);
   }
+
+  /**
+   * Tests issue https://issues.openbravo.com/view.php?id=14914 that view objects are not copied.
+   */
+  public void test14914() {
+    setBigBazaarUserContext();
+    OBContext.setAdminMode();
+    boolean testDone = false;
+    try {
+      for (ShipmentInOut o : OBDal.getInstance().createQuery(ShipmentInOut.class, "").list()) {
+        if (!o.getMaterialMgmtShipmentInOutLineVList().isEmpty()) {
+          final ShipmentInOut copied = (ShipmentInOut) DalUtil.copy(o);
+          assertTrue(copied.getMaterialMgmtShipmentInOutLineVList().isEmpty());
+          testDone = true;
+        }
+      }
+      assertTrue(testDone);
+    } finally {
+      OBContext.restorePreviousMode();
+    }
+  }
 }
\ No newline at end of file
--- a/src/org/openbravo/base/model/ModelProvider.java	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/base/model/ModelProvider.java	Fri Nov 05 11:44:01 2010 +0000
@@ -555,6 +555,7 @@
     newProp.setMandatory(true);
     newProp.setDomainType(idProperty.getDomainType());
     newProp.setColumnName(idProperty.getColumnName());
+    newProp.setColumnId(idProperty.getColumnId());
     newProp.setTargetEntity(idProperty.getTargetEntity());
     newProp.setReferencedProperty(idProperty.getTargetEntity().getIdProperties().get(0));
     newProp.setOneToOne(true);
--- a/src/org/openbravo/base/secureApp/AdvisePopUpRefresh.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/base/secureApp/AdvisePopUpRefresh.html	Fri Nov 05 11:44:01 2010 +0000
@@ -37,12 +37,15 @@
 	}
 
 	function closeThisPage() {
-		var refreshButton = opener.document.getElementById('buttonRefresh');
-		if(refreshButton)
-			refreshButton.onclick();	
-		top.close();
-		return true;
-	}
+    if (opener) {
+      var refreshButton = opener.document.getElementById('buttonRefresh');
+      if (refreshButton) {
+        refreshButton.onclick();
+      }
+    }
+    closePage();
+    return true;
+  }
 </script>
 </head>
 
--- a/src/org/openbravo/dal/core/DalUtil.java	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/dal/core/DalUtil.java	Fri Nov 05 11:44:01 2010 +0000
@@ -283,7 +283,7 @@
     for (final Property p : source.getEntity().getProperties()) {
       final Object value = source.getValue(p.getName());
       if (p.isOneToMany()) {
-        if (copyChildren) {
+        if (copyChildren && !p.getTargetEntity().isView()) {
           final List<BaseOBObject> targetChildren = new ArrayList<BaseOBObject>();
           target.setValue(p.getName(), targetChildren);
           @SuppressWarnings("unchecked")
--- a/src/org/openbravo/dal/service/OBQuery.java	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/dal/service/OBQuery.java	Fri Nov 05 11:44:01 2010 +0000
@@ -240,6 +240,9 @@
       } else {
         alias = strippedWhereClause.substring(0, index);
       }
+      if (alias.endsWith(",")) {
+        alias = alias.substring(0, alias.length() - 1);
+      }
       prefix = alias + ".";
     }
 
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Bank.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Bank.html	Fri Nov 05 11:44:01 2010 +0000
@@ -9,7 +9,7 @@
  * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
  * License for the specific  language  governing  rights  and  limitations
  * under the License. 
- * The Original Code is Openbravo ERP. 
+ * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU 
  * All portions are Copyright (C) 2001-2010 Openbravo SLU 
  * All Rights Reserved. 
@@ -499,7 +499,7 @@
               <td class="TextBox_ContentCell">
                 <input type="text" dojotype="openbravo:ValidationTextBox" class="TextBox_OneCell_width" name="inpDocumentNo" id="inpDocumentNo" value="" ><script>djConfig.searchIds.push("inpDocumentNo");</script>
               </td>
-              <td class="TitleCell"><span class="LabelText">Amount FromĀ </span> </td>
+              <td class="TitleCell"><span class="LabelText">Amount From</span> </td>
               <td class="TextBox_btn_ContentCell">
                   <table border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
                     <tr>
--- a/src/org/openbravo/erpCommon/ad_callouts/SE_ProjectLine_Value.java	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_callouts/SE_ProjectLine_Value.java	Fri Nov 05 11:44:01 2010 +0000
@@ -64,7 +64,7 @@
   }
 
   private void printPage(HttpServletResponse response, VariablesSecureApp vars,
-      String strmProductId, String strPriceListId, String strTabId, String strProjectId,
+      String strmProductId, String strPriceListVersion, String strTabId, String strProjectId,
       String strPhaseId, String strADOrgID) throws IOException, ServletException {
     if (log4j.isDebugEnabled())
       log4j.debug("Output: dataSheet");
@@ -92,24 +92,19 @@
       String strMWarehouseID = data1[0].warehouse;
       String strProjCat = data1[0].projcat;
 
-      if (!strPriceListId.equals("")) {
-        String strPriceListVersion = SEProjectLineValueData.selectPriceListVersion(this,
-            strPriceListId, strDate);
-        if (!strPriceListVersion.equals("")) {
-          String plannedprice = SEProjectLineValueData.selectPlannedPrice(this,
-              strPriceListVersion, strmProductId, strProjectId);
-          if (plannedprice != null && !plannedprice.equals("")) {
-            if (!strProjCat.equals("S")) {
-              resultado.append("new Array(\"inpplannedprice\", "
-                  + (plannedprice.equals("") ? "\"\"" : plannedprice) + "),\n");
-            } else {
-              resultado.append("new Array(\"inppriceactual\", "
-                  + (plannedprice.equals("") ? "\"\"" : plannedprice) + ")\n");
-            }
-          } else
-            strMessage = "PriceNotFound";
+      if (!strPriceListVersion.equals("")) {
+        String plannedprice = SEProjectLineValueData.selectPlannedPrice(this, strPriceListVersion,
+            strmProductId, strProjectId);
+        if (plannedprice != null && !plannedprice.equals("")) {
+          if (!strProjCat.equals("S")) {
+            resultado.append("new Array(\"inpplannedprice\", "
+                + (plannedprice.equals("") ? "\"\"" : plannedprice) + "),\n");
+          } else {
+            resultado.append("new Array(\"inppriceactual\", "
+                + (plannedprice.equals("") ? "\"\"" : plannedprice) + ")\n");
+          }
         } else
-          strMessage = "PriceListVersionNotFound";
+          strMessage = "PriceNotFound";
       }
       if (!strProjCat.equals("S")) {
         if (strCBPartnerLocationID != null && !strCBPartnerLocationID.equals("")
--- a/src/org/openbravo/erpCommon/ad_forms/DocInvoice.java	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/DocInvoice.java	Fri Nov 05 11:44:01 2010 +0000
@@ -353,12 +353,16 @@
         }
       else
         for (int i = 0; m_payments != null && i < m_payments.length; i++) {
+          BigDecimal amount = new BigDecimal(m_payments[i].Amount);
+          BigDecimal prepaidAmount = new BigDecimal(m_payments[i].PrepaidAmount);
           fact.createLine(m_payments[i], getAccountBPartner(C_BPartner_ID, as, true, false, conn),
-              this.C_Currency_ID, "", getConvertedAmt(m_payments[i].Amount,
+              this.C_Currency_ID, "", getConvertedAmt(amount.negate().toString(),
                   m_payments[i].C_Currency_ID_From, this.C_Currency_ID, DateAcct, "", conn),
               Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn);
+          // Pre-payment: Probably not needed as at this point we can not generate pre-payments
+          // against ARC. Amount is negated
           fact.createLine(m_payments[i], getAccountBPartner(C_BPartner_ID, as, true, true, conn),
-              this.C_Currency_ID, "", getConvertedAmt(m_payments[i].PrepaidAmount,
+              this.C_Currency_ID, "", getConvertedAmt(prepaidAmount.negate().toString(),
                   m_payments[i].C_Currency_ID_From, this.C_Currency_ID, DateAcct, "", conn),
               Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn);
         }
@@ -469,12 +473,16 @@
         }
       else
         for (int i = 0; m_payments != null && i < m_payments.length; i++) {
+          BigDecimal amount = new BigDecimal(m_payments[i].Amount);
+          BigDecimal prepaidAmount = new BigDecimal(m_payments[i].PrepaidAmount);
           fact.createLine(m_payments[i], getAccountBPartner(C_BPartner_ID, as, false, false, conn),
-              this.C_Currency_ID, getConvertedAmt(m_payments[i].Amount,
+              this.C_Currency_ID, getConvertedAmt(amount.negate().toString(),
                   m_payments[i].C_Currency_ID_From, this.C_Currency_ID, DateAcct, "", conn), "",
               Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn);
+          // Pre-payment: Probably not needed as at this point we can not generate pre-payments
+          // against APC. Amount is negated
           fact.createLine(m_payments[i], getAccountBPartner(C_BPartner_ID, as, false, true, conn),
-              this.C_Currency_ID, getConvertedAmt(m_payments[i].PrepaidAmount,
+              this.C_Currency_ID, getConvertedAmt(prepaidAmount.negate().toString(),
                   m_payments[i].C_Currency_ID_From, this.C_Currency_ID, DateAcct, "", conn), "",
               Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn);
         }
--- a/src/org/openbravo/erpCommon/ad_forms/Heartbeat.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/Heartbeat.html	Fri Nov 05 11:44:01 2010 +0000
@@ -32,9 +32,13 @@
   <script language="JavaScript" src="../../../../../web/js/ajax.js" type="text/javascript"></script>
   <script language="JavaScript" type="text/javascript">
   function openRegistration() {
-    var w = window.opener;
-    if(w) {
-      w.setTimeout("openRegistration();",100);
+    if (!isWindowInMDIContext) {
+      var w = window.opener;
+      if(w) {
+        w.setTimeout("openRegistration();",100);
+      }
+    } else {
+      getFrame('LayoutMDI').OB.Layout.ClassicOBCompatibility.Popup.openRegistration();
     }
     return true;
   }
@@ -54,7 +58,7 @@
     if (document.frmMain.showRegistration.value == 'Y') {
       openRegistration();
     }
-    window.close();
+    closePage();
   }
   </script>
 
--- a/src/org/openbravo/erpCommon/ad_forms/Heartbeat.java	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/Heartbeat.java	Fri Nov 05 11:44:01 2010 +0000
@@ -86,8 +86,7 @@
 
     String msgCode = vars.getCommand().equals("DEFAULT_MODULE") ? "HB_WELCOME_MODULE"
         : "HB_WELCOME";
-    xmlDocument.setParameter("welcome", Utility.formatMessageBDToHtml(Utility.messageBD(this,
-        msgCode, vars.getLanguage())));
+    xmlDocument.setParameter("welcome", Utility.messageBD(this, msgCode, vars.getLanguage()));
 
     xmlDocument.setParameter("recordId", vars.getStringParameter("inpcRecordId",
         IsIDFilter.instance));
--- a/src/org/openbravo/erpCommon/ad_forms/InstancePurpose.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/InstancePurpose.html	Fri Nov 05 11:44:01 2010 +0000
@@ -31,18 +31,26 @@
   <script language="JavaScript" src="../../../../../web/js/appStatus.js" type="text/javascript"></script>
   <script language="JavaScript" type="text/javascript">
   function openRegistration() {
-    var w = window.opener;
-    if(w) {
-      w.setTimeout("openRegistration();",100);
+    if (!isWindowInMDIContext) {
+      var w = window.opener;
+      if(w) {
+        w.setTimeout("openRegistration();",100);
+      }
+    } else {
+      getFrame('LayoutMDI').OB.Layout.ClassicOBCompatibility.Popup.openRegistration();
     }
     return true;
   }
   </script>
   <script language="JavaScript" type="text/javascript">
   function openHeartbeat() {
-    var w = window.opener;
-    if(w) {
-      w.setTimeout("openHeartbeat();",100);
+    if (!isWindowInMDIContext) {
+      var w = window.opener;
+      if(w) {
+        w.setTimeout("openHeartbeat();",100);
+      }
+    } else {
+      getFrame('LayoutMDI').OB.Layout.ClassicOBCompatibility.Popup.openHeartbeat();
     }
     return true;
   }
@@ -56,7 +64,7 @@
     } else {
       getFrame('LayoutMDI').OB.Layout.ViewManager.openView("ClassicOBWindow",  {viewId: "ClassicOBWindow", obManualURL: '/ad_forms/InstanceManagement.html', id: '/ad_forms/InstanceManagement.html', formId: '8D6282279F464B1696B0EE3E23023B65', command: "DEFAULT", tabTitle: 'Instance Activation'});
     }
-    window.close();
+    closePage();
   }
   function buttonOK() {
     var purpose = document.frmMain.instancePurpose;
@@ -79,16 +87,16 @@
         if (appFrame.document.getElementById('buttonRefresh')) {
           appFrame.document.getElementById('buttonRefresh').onclick();
         } else {
-          window.close();
+          closePage();
         }
       } else if (appFrame) {
         appFrame.updatePurposeImage(purpose.value);
-        window.close();
+        closePage();
       } else {
-        window.close();
+        closePage();
       }
     } else {
-      window.close();
+      closePage();
     }
 
   }
@@ -188,12 +196,13 @@
             <td class="TableEdition_OneCell_width"/>
           </tr>
           <tr><td height="20" colspan="4"></td></tr>
-          <tr id="purposeComboRow1"><td colspan="4"><span class="LabelText">What is the purpose of this Openbravo ERP instance?</span></td></tr>
+          <tr id="purposeComboRow1" style="height: 30px;"><td colspan="4"><span class="LabelText">What is the purpose of this Openbravo ERP instance?</span></td></tr>
+          <tr></tr>
           <tr id="purposeComboRow2">
             <td class="Combo_ContentCell" colspan="4"><select name="instancePurpose" id="inpInstancePurpose" class="ComboKey Combo_OneCell_width" required="yes">
                 <option value="">--please select--</option>
                 <div id="reportPurpose"></div>
-            </select><span id="noPurposeSelected" class="LabelText" style="color:red">You must select purpose</span></td>
+            </select><span id="noPurposeSelected" class="LabelText" style="color:red; font-weight: bold; padding-left: 10px;">You must select a purpose</span></td>
           </tr>
 
           <tr>
--- a/src/org/openbravo/erpCommon/ad_forms/InstancePurpose.java	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/InstancePurpose.java	Fri Nov 05 11:44:01 2010 +0000
@@ -96,8 +96,7 @@
         xmlDocument.setParameter("selectedPurpose", purpose);
       }
     }
-    xmlDocument.setParameter("welcome", Utility.formatMessageBDToHtml(Utility.messageBD(this,
-        strWelcomeMsg, vars.getLanguage())));
+    xmlDocument.setParameter("welcome", Utility.messageBD(this, strWelcomeMsg, vars.getLanguage()));
     xmlDocument.setParameter("title", Utility.messageBD(myPool, strTitle, vars.getLanguage()));
 
     xmlDocument.setParameter("recordId", vars.getStringParameter("inpcRecordId",
--- a/src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java	Fri Nov 05 11:44:01 2010 +0000
@@ -288,13 +288,13 @@
         rt = total
             + "&nbsp;"
             + Utility.messageBD(this, "ApplyModules", lang)
-            + ", <a id=\"rebuildNow\" class=\"LabelLink_noicon\" href=\"#\" onclick=\"openServletNewWindow('DEFAULT', false, '../ad_process/ApplyModules.html', 'BUTTON', null, true, 700, 900);return false;\">"
+            + ", <a id=\"rebuildNow\" class=\"LabelLink_noicon\" href=\"#\" onclick=\"openServletNewWindow('DEFAULT', false, '../ad_process/ApplyModules.html', 'BUTTON', null, true, 700, 900, null, null, null, null, true);return false;\">"
             + Utility.messageBD(this, "RebuildNow", lang) + "</a>";
       }
       String restartTomcat = ModuleManagementData.selectRestartTomcat(this);
       // Check if last build was done but Tomcat wasn't restarted
       if (!restartTomcat.equals("0")) {
-        rt = "<a class=\"LabelLink_noicon\" href=\"#\" onclick=\"openServletNewWindow('TOMCAT', false, '../ad_process/ApplyModules.html', 'BUTTON', null, true, 650, 900);return false;\">"
+        rt = "<a class=\"LabelLink_noicon\" href=\"#\" onclick=\"openServletNewWindow('TOMCAT', false, '../ad_process/ApplyModules.html', 'BUTTON', null, true, 650, 900, null, null, null, null, true);return false;\">"
             + Utility.messageBD(this, "Restart_Tomcat", lang) + "</a>";
         return rt;
 
--- a/src/org/openbravo/erpCommon/ad_forms/ModuleManagementAdd.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/ModuleManagementAdd.html	Fri Nov 05 11:44:01 2010 +0000
@@ -46,13 +46,13 @@
 <script language="JavaScript" type="text/javascript">
   function viewDetails(id) {
     document.frmMain.inpcRecordId.value = id;
-    openServletNewWindow('DETAIL', false, 'ModuleManagement.html', 'BUTTON', null, true, 600, 900);
+    openServletNewWindow('DETAIL', false, 'ModuleManagement.html', 'BUTTON', null, true, 600, 900, null, null, null, null, true);
     return false;
   }
   
   function installNow(id) {
     document.frmMain.inpcRecordId.value = id;
-    openServletNewWindow('INSTALL', false, 'ModuleManagement.html', 'BUTTON', null, true, 600, 900);
+    openServletNewWindow('INSTALL', false, 'ModuleManagement.html', 'BUTTON', null, true, 600, 900, null, null, null, null, true);
     return false;
   }
   
@@ -71,6 +71,10 @@
     setProcessingMode('window',false);
   }
   
+  function browseFileSystem() {
+    openServletNewWindow('LOCAL', false, 'ModuleManagement.html', 'BUTTON', null, true, 600, 900, null, null, null, null, true);
+    return true;
+  }
 
 </script>
   <script language="JavaScript" type="text/javascript">
@@ -313,7 +317,7 @@
                       <button type="button" 
                         id="buttonScan" 
                         class="ButtonLink" 
-                        onclick="openServletNewWindow('LOCAL', false, 'ModuleManagement.html', 'BUTTON', null, true, 600, 900);return false;" 
+                        onclick="browseFileSystem();return false;" 
                         onfocus="buttonEvent('onfocus', this); window.status='Browse File System'; return true;" 
                         onblur="buttonEvent('onblur', this);" 
                         onkeyup="buttonEvent('onkeyup', this);" 
--- a/src/org/openbravo/erpCommon/ad_forms/ModuleManagementDetails.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/ModuleManagementDetails.html	Fri Nov 05 11:44:01 2010 +0000
@@ -34,14 +34,9 @@
   var baseDirectory="../../../../../web/";
   </script>
   <script language="JavaScript" type="text/javascript" id="fieldWindowIDArray">
-  function closeThisPage() {
-    window.close();
-    return true;
-  }
-
   function viewModule(id) {
     document.frmMain.inpcRecordId.value = id;
-    openServletNewWindow('DETAIL', false, 'ModuleManagement.html', 'Details', null, true, 600, 900,null,null,false);
+    openServletNewWindow('DETAIL', false, 'ModuleManagement.html', 'Details', null, true, 600, 900,null, null, false, null, true);
     return false;
   }
   </script>
@@ -173,7 +168,7 @@
                   <button type="button" 
                     id="buttonOK" 
                     class="ButtonLink" 
-                    onclick="closeThisPage();return false;" 
+                    onclick="closePage();return false;" 
                     onfocus="buttonEvent('onfocus', this); window.status='Accept'; return true;" 
                     onblur="buttonEvent('onblur', this);" 
                     onkeyup="buttonEvent('onkeyup', this);" 
--- a/src/org/openbravo/erpCommon/ad_forms/ModuleManagementInstalled.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/ModuleManagementInstalled.html	Fri Nov 05 11:44:01 2010 +0000
@@ -143,7 +143,7 @@
   
   function installUpdate(id){
     frmMain.inpcUpdate.value = id;
-    openServletNewWindow('UPDATE', false, 'ModuleManagement.html', 'Update', null, true, 700, 900);
+    openServletNewWindow('UPDATE', false, 'ModuleManagement.html', 'Update', null, true, 700, 900, null, null, null, null, true);
   }
 
   function uninstallModule(){
--- a/src/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html	Fri Nov 05 11:44:01 2010 +0000
@@ -32,13 +32,6 @@
   var baseDirectory="../../../../../web/";
   </script>
   <script language="JavaScript" type="text/javascript">
-  function closeThisPage() {
-    window.close();
-    return true;
-  }
-
-  </script>
-  <script language="JavaScript" type="text/javascript">
   function onLoadDo(){
     this.windowTables = new Array(
       new windowTableId('client', 'buttonCancel')
@@ -262,7 +255,7 @@
                   <button type="button" 
                     id="buttonCancel" 
                     class="ButtonLink" 
-                    onclick="closeThisPage();return false;" 
+                    onclick="closePage();return false;" 
                     onfocus="buttonEvent('onfocus', this); window.status='Cancel'; return true;" 
                     onblur="buttonEvent('onblur', this);" 
                     onkeyup="buttonEvent('onkeyup', this);" 
--- a/src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallLocal.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallLocal.html	Fri Nov 05 11:44:01 2010 +0000
@@ -44,11 +44,6 @@
   var baseDirectory="../../../../../web/";
   </script>
   <script language="JavaScript" type="text/javascript" id="fieldWindowIDArray">
-  function closeThisPage() {
-    window.close();
-    return true;
-  }
-
   function viewModule(id) {
     document.frmMain.inpcRecordId.value = id;
     submitCommandForm('DETAIL', false, null, 'ModuleManagement.html', '_self', null, true);return false;
@@ -281,7 +276,7 @@
                   <button type="button" 
                     id="buttonCancel" 
                     class="ButtonLink" 
-                    onclick="closeThisPage();return false;" 
+                    onclick="closePage();return false;" 
                     onfocus="buttonEvent('onfocus', this); window.status='Cancel'; return true;" 
                     onblur="buttonEvent('onblur', this);" 
                     onkeyup="buttonEvent('onkeyup', this);" 
--- a/src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallP1.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallP1.html	Fri Nov 05 11:44:01 2010 +0000
@@ -33,13 +33,6 @@
   <script language="JavaScript" type="text/javascript" id="paramDirectory">
   var baseDirectory="../../../../../web/";
   </script>
-  <script language="JavaScript" type="text/javascript" id="fieldWindowIDArray">
-  function closeThisPage() {
-    window.close();
-    return true;
-  }
-
-  </script>
   <script language="JavaScript" type="text/javascript">
   function onLoadDo(){
     this.windowTables = new Array(
@@ -57,8 +50,7 @@
   
   function viewModule(id) {
     document.frmMain.inpcRecordId.value = id;
-
-    openServletNewWindow('DETAIL', false, 'ModuleManagement.html', 'Details', null, false, 600, 900,null,null,false);
+    openServletNewWindow('DETAIL', false, 'ModuleManagement.html', 'Details', null, false, 600, 900, null, null, false, null, true);
     return false;
   }
   </script>    
@@ -306,7 +298,7 @@
                   <button type="button" 
                     id="buttonCancel" 
                     class="ButtonLink" 
-                    onclick="closeThisPage();return false;" 
+                    onclick="closePage();return false;" 
                     onfocus="buttonEvent('onfocus', this); window.status='Cancel'; return true;" 
                     onblur="buttonEvent('onblur', this);" 
                     onkeyup="buttonEvent('onkeyup', this);" 
--- a/src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallP2.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallP2.html	Fri Nov 05 11:44:01 2010 +0000
@@ -34,11 +34,6 @@
   
   <script language="JavaScript" type="text/javascript" id="paramDirectory"></script>
   <script language="JavaScript" type="text/javascript">
-  function closeThisPage() {
-    window.close();
-    return true;
-  }
-
   function viewModule(id) {
     document.frmMain.inpcRecordId.value = id;
     submitCommandForm('DETAIL', false, null, 'ModuleManagement.html', '_self', null, false);return false;
@@ -350,7 +345,7 @@
                   <button type="button" 
                     id="buttonCancel" 
                     class="ButtonLink" 
-                    onclick="closeThisPage();return false;" 
+                    onclick="closePage();return false;" 
                     onfocus="buttonEvent('onfocus', this); window.status='Cancel'; return true;" 
                     onblur="buttonEvent('onblur', this);" 
                     onkeyup="buttonEvent('onkeyup', this);" 
--- a/src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallP4.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallP4.html	Fri Nov 05 11:44:01 2010 +0000
@@ -32,11 +32,6 @@
 <script language="JavaScript" src="../utility/DynamicJS.js" type="text/javascript"></script>
   <script language="JavaScript" type="text/javascript" id="paramDirectory"></script>
   <script language="JavaScript" type="text/javascript">
-  function closeThisPage() {
-    window.close();
-    return true;
-  }
-
   function viewModule(id) {
     document.frmMain.inpcRecordId.value = id;
     submitCommandForm('DETAIL', false, null, 'ModuleManagement.html', '_self', null, false);return false;
@@ -219,7 +214,7 @@
                   <button type="button" 
                     id="buttonOK" 
                     class="ButtonLink" 
-                    onclick="window.opener.submitCommandForm('DEFAULT', false, null, 'ModuleManagement.html', '_self', null, false);closeThisPage();return false;" 
+                    onclick="window.opener.submitCommandForm('DEFAULT', false, null, 'ModuleManagement.html', '_self', null, false);closePage();return false;" 
                     onfocus="setWindowElementFocus(this); window.status='Accept'; return true;" 
                     onblur="buttonEvent('onblur', this);" 
                     onkeyup="buttonEvent('onkeyup', this);" 
--- a/src/org/openbravo/erpCommon/ad_forms/Registration.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/Registration.html	Fri Nov 05 11:44:01 2010 +0000
@@ -33,16 +33,20 @@
   function configure() {
 	var regURL = typeof url === 'undefined' ? 'http://www.openbravo.com/embedreg/form' : url;
   	submitCommandForm('REGISTER', false, null);
-  	window.opener.submitCommandForm('DEFAULT', false, null, regURL, '_blank', null, false);
-  	self.close();
+    if (!isWindowInMDIContext) {
+      window.opener.submitCommandForm('DEFAULT', false, null, regURL, '_blank', null, false);
+    } else {
+      submitCommandForm('DEFAULT', false, null, regURL, '_blank', null, false);
+    }
+  	closePage();
   }
   function disable() {
   	submitCommandForm('DISABLE', false, null);
-  	window.close();
+  	closePage();
   }
   function postpone() {
   	submitCommandForm('POSTPONE', false, null);
-  	window.close();
+  	closePage();
   }
   </script>
 
--- a/src/org/openbravo/erpCommon/ad_forms/ShowLogFile.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/ShowLogFile.html	Fri Nov 05 11:44:01 2010 +0000
@@ -37,6 +37,13 @@
   <script language="JavaScript" type="text/javascript" id="paramDirectory">
     var baseDirectory="../../../../../web/";
   </script>
+  <script language="JavaScript" type="text/javascript">
+    function onLoadDo() {
+    }
+
+    function onUnloadDo() {
+    }
+  </script>
 </head>
 <body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0"  onload="onLoadDo();" onunload="onUnloadDo();" id="paramMessage">
   <form id="form" method="post" action="ApplyModules.html" name="frmMain" target="hiddenFrame">
--- a/src/org/openbravo/erpCommon/ad_help/DisplayHelp.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_help/DisplayHelp.html	Fri Nov 05 11:44:01 2010 +0000
@@ -135,7 +135,7 @@
                           <td class="FieldGroupContent"></td>
                           <td class="FieldGroupTitle_Left"><img class="FieldGroupTitle_Left_bg" border="0" src="../../../../../web/images/blank.gif"></img></td>
                           <td class="FieldGroupTitle" style="padding-top:4px;" id="discardEdit">
-                            <a href="#" onclick="editHelp('DisplayHelp_Edit_FS.html', 'xx', 'paramWindowHelp', 'yy');return false;" onmouseover="window.status='Edit Help';return true;" onmouseout="window.status='';return true;" id="paramWindowId" class="Popup_Client_Help_Icon_LabelLink"><img class="Popup_Client_Help_Icon_edit" border="0" src="../../../../../web/images/blank.gif"></img></a>
+                            <a href="#" onclick="editHelp('DisplayHelp_Edit_FS.html', 'xx', 'paramWindowHelp', 'yy', null, null, true);return false;" onmouseover="window.status='Edit Help';return true;" onmouseout="window.status='';return true;" id="paramWindowId" class="Popup_Client_Help_Icon_LabelLink"><img class="Popup_Client_Help_Icon_edit" border="0" src="../../../../../web/images/blank.gif"></img></a>
                             <!--a href="#"><img class="Popup_Client_Help_Icon_top" border="0" src="../../../../../web/images/blank.gif"></img></a-->
                           </td>
                           <td class="FieldGroupTitle_Right"><img class="FieldGroupTitle_Right_bg" border="0" src="../../../../../web/images/blank.gif"></img></td>
@@ -159,7 +159,7 @@
                           <td class="FieldGroupContent"></td>
                           <td class="FieldGroupTitle_Left"><img class="FieldGroupTitle_Left_bg" border="0" src="../../../../../web/images/blank.gif"></img></td>
                           <td class="FieldGroupTitle" style="padding-top:4px;">
-                            <span id="discardEdit"><a href="#" onclick="editHelp('DisplayHelp_Edit_FS.html','TAB', 'paramTabxxHelp', 'yy');return false;" onmouseover="window.status='Edit help';return true;" onmouseout="window.status='';return true;" id="fieldTabIdDescription" class="Popup_Client_Help_Icon_LabelLink"><img class="Popup_Client_Help_Icon_edit" border="0" src="../../../../../web/images/blank.gif"></img></a></span>
+                            <span id="discardEdit"><a href="#" onclick="editHelp('DisplayHelp_Edit_FS.html','TAB', 'paramTabxxHelp', 'yy', null, null, true);return false;" onmouseover="window.status='Edit help';return true;" onmouseout="window.status='';return true;" id="fieldTabIdDescription" class="Popup_Client_Help_Icon_LabelLink"><img class="Popup_Client_Help_Icon_edit" border="0" src="../../../../../web/images/blank.gif"></img></a></span>
                             <a href="#WindowName" onmouseover="window.status='Go to the top';return true;" onmouseout="window.status='';return true;" class="Popup_Client_Help_Icon_LabelLink"><img class="Popup_Client_Help_Icon_top" border="0" src="../../../../../web/images/blank.gif"></img></a>
                           </td>
                           <td class="FieldGroupTitle_Right"><img class="FieldGroupTitle_Right_bg" border="0" src="../../../../../web/images/blank.gif"></img></td>
@@ -192,7 +192,7 @@
                           <td class="FieldGroupContent"></td>
                           <td class="FieldGroupTitle_Left"><img class="FieldGroupTitle_Left_bg" border="0" src="../../../../../web/images/blank.gif"></img></td>
                           <td class="FieldGroupTitle" style="padding-top:4px;">
-                            <!--a href="#" onclick="editHelp('DisplayHelp_Edit_FS.html','TAB', 'paramTabxxHelp', 'yy');return false;" onmouseover="window.status='Edit help';return true;" onmouseout="window.status='';return true;" id="fieldTabIdDescription"><img class="Popup_Client_Help_Icon_edit" border="0" src="../../../../../web/images/blank.gif"></img></a-->
+                            <!--a href="#" onclick="editHelp('DisplayHelp_Edit_FS.html','TAB', 'paramTabxxHelp', 'yy', null, null, true);return false;" onmouseover="window.status='Edit help';return true;" onmouseout="window.status='';return true;" id="fieldTabIdDescription"><img class="Popup_Client_Help_Icon_edit" border="0" src="../../../../../web/images/blank.gif"></img></a-->
                             <a href="#WindowName" onmouseover="window.status='Go to the top';return true;" onmouseout="window.status='';return true;" class="Popup_Client_Help_Icon_LabelLink"><img class="Popup_Client_Help_Icon_top" border="0" src="../../../../../web/images/blank.gif"></img></a>
                           </td>
                           <td class="FieldGroupTitle_Right"><img class="FieldGroupTitle_Right_bg" border="0" src="../../../../../web/images/blank.gif"></img></td>
@@ -214,7 +214,7 @@
                           <td class="FieldGroupContent"></td>
                           <td class="FieldGroupTitle_Left"><img class="FieldGroupTitle_Left_bg" border="0" src="../../../../../web/images/blank.gif"></img></td>
                           <td class="FieldGroupTitle" style="padding-top:4px;">
-                            <span id="discardEdit"><a href="#" onclick="editHelp('DisplayHelp_Edit_Field_FS.html', 'FIELD', 'paramFieldxx', 'yy');return false;" onmouseover="window.status='Edit help';return true;" onmouseout="window.status='';return true;" id="fieldFieldIdDesc" class="Popup_Client_Help_Icon_LabelLink"><img class="Popup_Client_Help_Icon_edit" border="0" src="../../../../../web/images/blank.gif"></img></a></span>
+                            <span id="discardEdit"><a href="#" onclick="editHelp('DisplayHelp_Edit_Field_FS.html', 'FIELD', 'paramFieldxx', 'yy', null, null, true);return false;" onmouseover="window.status='Edit help';return true;" onmouseout="window.status='';return true;" id="fieldFieldIdDesc" class="Popup_Client_Help_Icon_LabelLink"><img class="Popup_Client_Help_Icon_edit" border="0" src="../../../../../web/images/blank.gif"></img></a></span>
                             <a href="#Tabxx" id="fieldTabGoTo" onmouseover="window.status='Go to the top';return true;" onmouseout="window.status='';return true;" class="Popup_Client_Help_Icon_LabelLink"><img class="Popup_Client_Help_Icon_top" border="0" src="../../../../../web/images/blank.gif"></img></a>
                           </td>
                           <td class="FieldGroupTitle_Right"><img class="FieldGroupTitle_Right_bg" border="0" src="../../../../../web/images/blank.gif"></img></td>
--- a/src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Element_F1.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Element_F1.html	Fri Nov 05 11:44:01 2010 +0000
@@ -68,9 +68,6 @@
       document.frmMain.inpHelp.value = xinha_editors.idfieldHelp.getHTML();
       return true;
     }
-    function closeWindow() {
-      top.close();
-    }
   </script>
   <script language="JavaScript" type="text/javascript">
     function onLoadDo() {
@@ -296,7 +293,7 @@
                 <button type="button" 
                   id="buttonCancel" 
                   class="ButtonLink" 
-                  onclick="closeWindow();return false;" 
+                  onclick="closePage();return false;" 
                   onfocus="buttonEvent('onfocus', this); window.status='Cancel'; return true;" 
                   onblur="buttonEvent('onblur', this);" 
                   onkeyup="buttonEvent('onkeyup', this);" 
--- a/src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Element_F2.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Element_F2.html	Fri Nov 05 11:44:01 2010 +0000
@@ -27,7 +27,7 @@
 <script language="JavaScript" src="../../../../../web/js/windowKeyboard.js" type="text/javascript"></script>
 <script language="JavaScript" type="text/javascript" id="discardClose">
 function cerrarHelpEditor(){
-  top.close();
+  closePage();
   return true;
 }
 </script>
--- a/src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_F1.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_F1.html	Fri Nov 05 11:44:01 2010 +0000
@@ -69,9 +69,6 @@
       document.frmMain.inpHelp.value = xinha_editors.idfieldHelp.getHTML();
       return true;
     }
-    function closeWindow() {
-      top.close();
-    }
   </script>
   <script language="JavaScript" type="text/javascript">
     function onLoadDo() {
@@ -289,7 +286,7 @@
                 <button type="button" 
                   id="buttonCancel" 
                   class="ButtonLink" 
-                  onclick="closeWindow();return false;" 
+                  onclick="closePage();return false;" 
                   onfocus="buttonEvent('onfocus', this); window.status='Cancel'; return true;" 
                   onblur="buttonEvent('onblur', this);" 
                   onkeyup="buttonEvent('onkeyup', this);" 
--- a/src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_F2.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_F2.html	Fri Nov 05 11:44:01 2010 +0000
@@ -32,10 +32,10 @@
   var key = frm.inpClave.value;
   if (type=="Window") key = "";
   var name=frm.inpName.value;
-  top.opener.layer('param' + type + 'Name' + key, name, true);
+  parent.opener.layer('param' + type + 'Name' + key, name, true);
   var help=frm.inpHelp.value;
-  top.opener.layer('param' + type + 'Help' + key, help, true);
-  top.close();
+  parent.opener.layer('param' + type + 'Help' + key, help, true);
+  closePage();
   return true;
 }
 </script>
--- a/src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Field_F1.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Field_F1.html	Fri Nov 05 11:44:01 2010 +0000
@@ -68,9 +68,6 @@
       document.frmMain.inpHelp.value = xinha_editors.idfieldHelp.getHTML();
       return true;
     }
-    function closeWindow() {
-      top.close();
-    }
   </script>
   <script language="JavaScript" type="text/javascript">
     function onLoadDo() {
@@ -294,7 +291,7 @@
                 <button type="button" 
                   id="buttonCancel" 
                   class="ButtonLink" 
-                  onclick="closeWindow();return false;" 
+                  onclick="closePage();return false;" 
                   onfocus="buttonEvent('onfocus', this); window.status='Cancel'; return true;" 
                   onblur="buttonEvent('onblur', this);" 
                   onkeyup="buttonEvent('onkeyup', this);" 
--- a/src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Field_F2.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Field_F2.html	Fri Nov 05 11:44:01 2010 +0000
@@ -32,10 +32,10 @@
   var key = frm.inpClave.value;
   if (type=="Window") key = "";
   var name=frm.inpName.value;
-  top.opener.layer('param' + type + 'Name' + key, name, true);
+  parent.opener.layer('param' + type + 'Name' + key, name, true);
   var help=frm.inpHelp.value;
-  top.opener.layer('param' + type + 'Help' + key, help, true);
-  top.close();
+  parent.opener.layer('param' + type + 'Help' + key, help, true);
+  closePage();
   return true;
 }
 </script>
--- a/src/org/openbravo/erpCommon/ad_process/ApplyModules.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_process/ApplyModules.html	Fri Nov 05 11:44:01 2010 +0000
@@ -33,12 +33,6 @@
   <script language="JavaScript" src="../../../../../web/js/windowKeyboard.js" type="text/javascript"></script>
   <script language="JavaScript" src="../../../../../web/js/ajax.js" type="text/javascript"></script>
   <script language="JavaScript" type="text/javascript" id="paramDirectory"></script>
-  <script language="JavaScript" type="text/javascript">
-    function closeThisPage() {
-      window.close();
-      return true;
-    }
-  </script>
   <script language="JavaScript" type="text/javascript" id="jsparam">
 
   </script>
@@ -216,15 +210,15 @@
       if (document.frmMain.option[0].checked) {
         window.opener.submitCommandForm('RESTART', false, null, '../ad_process/ApplyModules.html', '_self', null, false);
         restarting=true;
-        closeThisPage();
+        closePage();
         return false;
       } else if (document.frmMain.option[1].checked) {
         window.opener.submitCommandForm('RELOAD', false, null, '../ad_process/ApplyModules.html', '_self', null, false);
         restarting=true;
-        closeThisPage();
+        closePage();
         return false;
       } else if (document.frmMain.option[2].checked) {
-        closeThisPage();
+        closePage();
         return;
       }
     } 
@@ -461,7 +455,7 @@
             var frm = document.frmMain;
             startLocalTimer('localTimer');
             processing = true;
-            top.opener.setProcessingMode('window', true, false);
+            window.opener.setProcessingMode('window', true, false);
             displayLogicElement('confirmation',false);
             displayLogicElement('rebuildTable',true);
             return submitXmlHttpRequest(endProcess, frm, "STARTAPPLY", "ApplyModules.html", false, null, null);
@@ -495,7 +489,7 @@
     }
     
     function onUnloadDo() {
-      top.opener.setProcessingMode('window', false);
+      window.opener.setProcessingMode('window', false);
       if(!restarting){
         reloadOpener();
       }
@@ -705,7 +699,7 @@
                 <button type="button" 
                   id="buttonCancel" 
                   class="ButtonLink" 
-                  onclick="closeThisPage();return false;" 
+                  onclick="closePage();return false;" 
                   onfocus="buttonEvent('onfocus', this); window.status='Cancel'; return true;" 
                   onblur="buttonEvent('onblur', this);" 
                   onkeyup="buttonEvent('onkeyup', this);" 
@@ -747,13 +741,13 @@
               </td></tr>
               <tr><td height="10"></td></tr>
               <tr>
-                <td colspan="4"><span class="Radio_container_NOT_focused"><input name="option" required="true" value="restart" type="radio" checked></span><span class="PlainText_normal" style="padding: 0 0 0 10;">Restart servlet container now &nbsp;<a onclick="openHelp(null, '../ad_help/DisplayHelp.html', 'HELP', false, null, null, 'X', '25C886DA08E947F29AAC1D30D8B753A1');return false;" target="_blank" href="#restart">learn more</a></span></td>
+                <td colspan="4"><span class="Radio_container_NOT_focused"><input name="option" required="true" value="restart" type="radio" checked></span><span class="PlainText_normal" style="padding: 0 0 0 10;">Restart servlet container now &nbsp;<a onclick="openHelp(null, '../ad_help/DisplayHelp.html', 'HELP', false, null, null, 'X', '25C886DA08E947F29AAC1D30D8B753A1', true);return false;" target="_blank" href="#restart">learn more</a></span></td>
               </tr>
               <tr>
-                <td colspan="4"><span class="Radio_container_NOT_Focused"><input name="option" required="true" value="reload" type="radio"></span><span class="PlainText_normal" style="padding: 0 0 0 10;">Reload the Openbravo application now &nbsp;<a onclick="openHelp(null, '../ad_help/DisplayHelp.html', 'HELP', false, null, null, 'X', '25C886DA08E947F29AAC1D30D8B753A1');return false;" target="_blank" href="#reload">learn more</a></span></td>
+                <td colspan="4"><span class="Radio_container_NOT_Focused"><input name="option" required="true" value="reload" type="radio"></span><span class="PlainText_normal" style="padding: 0 0 0 10;">Reload the Openbravo application now &nbsp;<a onclick="openHelp(null, '../ad_help/DisplayHelp.html', 'HELP', false, null, null, 'X', '25C886DA08E947F29AAC1D30D8B753A1', true);return false;" target="_blank" href="#reload">learn more</a></span></td>
               </tr>
               <tr>
-                <td colspan="4"><span class="Radio_container_NOT_Focused"><input name="option" required="true" value="doNothing" type="radio"></span><span class="PlainText_normal" style="padding: 0 0 0 10;">Don't do anything now. I will reload the Openbravo application manually later &nbsp;<a onclick="openHelp(null, '../ad_help/DisplayHelp.html', 'HELP', false, null, null, 'X', '25C886DA08E947F29AAC1D30D8B753A1');return false;" target="_blank" href="#nothing">learn more</a></span></td>
+                <td colspan="4"><span class="Radio_container_NOT_Focused"><input name="option" required="true" value="doNothing" type="radio"></span><span class="PlainText_normal" style="padding: 0 0 0 10;">Don't do anything now. I will reload the Openbravo application manually later &nbsp;<a onclick="openHelp(null, '../ad_help/DisplayHelp.html', 'HELP', false, null, null, 'X', '25C886DA08E947F29AAC1D30D8B753A1', true);return false;" target="_blank" href="#nothing">learn more</a></span></td>
               </tr>
 
               <tr><td height="20"></td></tr>
@@ -829,7 +823,7 @@
               <tr>
                 <td colspan="4">
                   <div>
-                    <button type="button" id="buttonLog" class="ButtonLink" onclick="openServletNewWindow('DEFAULT', false, '../ad_forms/ShowLogFile.html?filePath=xx', 'Show Log', null, false, 600, 900,null,null,false);" onfocus="buttonEvent('onfocus', this); window.status='Show log'; return true;" onblur="buttonEvent('onblur', this);" onkeyup="buttonEvent('onkeyup', this);" onkeydown="buttonEvent('onkeydown', this);" onkeypress="buttonEvent('onkeypress', this);" onmouseup="buttonEvent('onmouseup', this);" onmousedown="buttonEvent('onmousedown', this);" onmouseover="buttonEvent('onmouseover', this); window.status='Show log'; return true;" onmouseout="buttonEvent('onmouseout', this);">
+                    <button type="button" id="buttonLog" class="ButtonLink" onclick="openServletNewWindow('DEFAULT', false, '../ad_forms/ShowLogFile.html?filePath=xx', 'Show Log', null, false, 600, 900, null, null, false, null, true);" onfocus="buttonEvent('onfocus', this); window.status='Show log'; return true;" onblur="buttonEvent('onblur', this);" onkeyup="buttonEvent('onkeyup', this);" onkeydown="buttonEvent('onkeydown', this);" onkeypress="buttonEvent('onkeypress', this);" onmouseup="buttonEvent('onmouseup', this);" onmousedown="buttonEvent('onmousedown', this);" onmouseover="buttonEvent('onmouseover', this); window.status='Show log'; return true;" onmouseout="buttonEvent('onmouseout', this);">
                       <table class="Button">
                         <tr>
                           <td class="Button_left"><img class="Button_Icon" alt="Show log" title="Show log" src="../web/images/blank.gif" border="0"/></td>
--- a/src/org/openbravo/erpCommon/ad_process/HeartbeatProcess.java	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_process/HeartbeatProcess.java	Fri Nov 05 11:44:01 2010 +0000
@@ -308,6 +308,16 @@
         hbLog.setInstalledModules(systemInfo.getProperty(SystemInfo.Item.MODULES.getLabel()));
         hbLog.setActivationKeyIdentifier(systemInfo.getProperty(SystemInfo.Item.OBPS_INSTANCE
             .getLabel()));
+        if (ActivationKey.getInstance().isOPSInstance()) {
+          try {
+            hbLog.setInstanceNumber(Long.parseLong(systemInfo
+                .getProperty(SystemInfo.Item.INSTANCE_NUMBER.getLabel())));
+          } catch (NumberFormatException e) {
+            log.warn("Incorrect instance number: "
+                + systemInfo.getProperty(SystemInfo.Item.INSTANCE_NUMBER.getLabel()));
+          }
+        }
+
         try {
           hbLog.setFirstLogin(SystemInfo.parseDate(systemInfo
               .getProperty(SystemInfo.Item.FIRST_LOGIN.getLabel())));
@@ -373,6 +383,13 @@
           log.warn("Incorrect number of orgs: "
               + systemInfo.getProperty(SystemInfo.Item.NUMBER_OF_ORGS.getLabel()));
         }
+        try {
+          hbLog.setRejectedLoginsDueConcUsers(Long.parseLong(systemInfo
+              .getProperty(SystemInfo.Item.REJECTED_LOGINS_DUE_CONC_USERS.getLabel())));
+        } catch (NumberFormatException e) {
+          log.warn("Incorrect number of rejected logins: "
+              + SystemInfo.Item.REJECTED_LOGINS_DUE_CONC_USERS.getLabel());
+        }
       }
       OBDal.getInstance().save(hbLog);
     } finally {
--- a/src/org/openbravo/erpCommon/ad_process/HeartbeatRedirect.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_process/HeartbeatRedirect.html	Fri Nov 05 11:44:01 2010 +0000
@@ -28,10 +28,14 @@
   <script language="JavaScript" src="../../../../../web/js/shortcuts.js" type="text/javascript"></script> 
   <script language="JavaScript" src="../../../../../web/js/utils.js" type="text/javascript"></script> 
   <script language="JavaScript" src="../../../../../web/js/windowKeyboard.js" type="text/javascript"></script>
-  <script language="JavaScript" type="text/javascript">    
-  function redirect() {  
-	  openLink('../HeartbeatConfiguration/HeartbeatConfiguration_Relation.html', 'appFrame');
-	  window.close();
+  <script language="JavaScript" type="text/javascript">
+  function redirect() {
+    if (!isWindowInMDIContext) {
+      openLink('../HeartbeatConfiguration/HeartbeatConfiguration_Relation.html', 'appFrame');
+    } else {
+      getFrame('LayoutMDI').OB.Layout.ViewManager.openView("ClassicOBWindow",  {viewId: "ClassicOBWindow", tabId: '1005400006', id: '1005400006', windowId: '1005400002', command: "DEFAULT", tabTitle: 'Heartbeat Configuration'});
+    }
+    closePage();
   }
   </script>
 </head>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportExpense.java	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportExpense.java	Fri Nov 05 11:44:01 2010 +0000
@@ -84,13 +84,14 @@
       String strCurrencyId = vars.getGlobalVariable("inpCurrencyId", "ReportExpense|currency",
           strUserCurrencyId);
       String strOutput = "html";
-       if (vars.commandIn("PDF")){
+      if (vars.commandIn("PDF")) {
         strOutput = "pdf";
-      printPageDataPDF(request, response, vars, strDateFrom, strDateTo, strcBpartnerId,
-          strPartner, strProject, strExpense, strCurrencyId, strOutput);
-        
-      } else printPageDataHtml(request, response, vars, strDateFrom, strDateTo, strcBpartnerId,
-          strPartner, strProject, strExpense, strCurrencyId);
+        printPageDataPDF(request, response, vars, strDateFrom, strDateTo, strcBpartnerId,
+            strPartner, strProject, strExpense, strCurrencyId, strOutput);
+
+      } else
+        printPageDataHtml(request, response, vars, strDateFrom, strDateTo, strcBpartnerId,
+            strPartner, strProject, strExpense, strCurrencyId);
     } else
       pageError(response);
   }
@@ -127,6 +128,14 @@
         myMessage = Utility.translateError(this, vars, vars.getLanguage(), ex.getMessage());
       }
     }
+    for (int i = 0; i < data1.length; i++) {
+      String count = ReportExpenseData.selectUOM(this, data1[i].cuomid);
+      if (Integer.parseInt(count) == 0) {
+        advisePopUp(request, response, "ERROR", Utility
+            .messageBD(this, "Error", vars.getLanguage()), Utility.messageBD(this,
+            "NoConversionDayUom", vars.getLanguage()));
+      }
+    }
     strConvRateErrorMsg = myMessage.getMessage();
     // If a conversion rate is missing for a certain transaction, an error
     // message window pops-up.
@@ -148,10 +157,10 @@
     }
   }
 
-private void printPageDataPDF(HttpServletRequest request, HttpServletResponse response,
+  private void printPageDataPDF(HttpServletRequest request, HttpServletResponse response,
       VariablesSecureApp vars, String strDateFrom, String strDateTo, String strcBpartnerId,
-      String strPartner, String strProject, String strExpense, String strCurrencyId, String strOutput) throws IOException,
-      ServletException {
+      String strPartner, String strProject, String strExpense, String strCurrencyId,
+      String strOutput) throws IOException, ServletException {
     if (log4j.isDebugEnabled())
       log4j.debug("Output: PDF");
     String discard[] = { "sectionPartner" };
@@ -179,6 +188,14 @@
         myMessage = Utility.translateError(this, vars, vars.getLanguage(), ex.getMessage());
       }
     }
+    for (int i = 0; i < data1.length; i++) {
+      String count = ReportExpenseData.selectUOM(this, data1[i].cuomid);
+      if (Integer.parseInt(count) == 0) {
+        advisePopUp(request, response, "ERROR", Utility
+            .messageBD(this, "Error", vars.getLanguage()), Utility.messageBD(this,
+            "NoConversionDayUom", vars.getLanguage()));
+      }
+    }
     strConvRateErrorMsg = myMessage.getMessage();
     // If a conversion rate is missing for a certain transaction, an error
     // message window pops-up.
--- a/src/org/openbravo/erpCommon/ad_reports/ReportExpense_data.xsql	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportExpense_data.xsql	Fri Nov 05 11:44:01 2010 +0000
@@ -25,13 +25,13 @@
     <Sql>
     <![CDATA[
       SELECT C_CURRENCY_ISOSYM(?) AS CONVISOSYM, CBE.NAME AS EMPLOYEE, (CASE S_L.ISTIMEREPORT WHEN 'Y' THEN S_L.QTY ELSE 0 END) * 
-      	  C_CURRENCY_CONVERT(C_CALCULATECOST_CATSALARY(C_CALCULATE_CATSALARY(s.c_bpartner_id,  (CASE WHEN S_L.DATEEXPENSE IS NULL THEN S.DATEREPORT ELSE S_L.DATEEXPENSE END)), (CASE WHEN S_L.DATEEXPENSE IS NULL THEN S.DATEREPORT ELSE S_L.DATEEXPENSE END)),
-      	  ?, ?, (CASE WHEN S_L.DATEEXPENSE IS NULL THEN S.DATEREPORT ELSE S_L.DATEEXPENSE END), NULL, S_L.AD_CLIENT_ID, S_L.AD_ORG_ID) AS COST, 
+      	 C_Uom_Convert(C_CURRENCY_CONVERT(C_CALCULATECOST_CATSALARY(C_CALCULATE_CATSALARY(s.c_bpartner_id,  (CASE WHEN S_L.DATEEXPENSE IS NULL THEN S.DATEREPORT ELSE S_L.DATEEXPENSE END)), (CASE WHEN S_L.DATEEXPENSE IS NULL THEN S.DATEREPORT ELSE S_L.DATEEXPENSE END)),
+      	  ?, ?, (CASE WHEN S_L.DATEEXPENSE IS NULL THEN S.DATEREPORT ELSE S_L.DATEEXPENSE END), NULL, S_L.AD_CLIENT_ID, S_L.AD_ORG_ID),C_UOM.C_UOM_ID, (select C_UOM_CONVERSION.C_UOM_TO_ID from C_UOM_CONVERSION WHERE C_UOM_CONVERSION.C_UOM_ID = C_UOM.C_UOM_ID),'Y') AS COST, 
 	      CBC.NAME AS NAME, (P.VALUE || ' - ' ||P.NAME) AS DESCR, M_PRODUCT.NAME AS PRODUCTNAME, C_UOM.NAME AS UOMNAME,
-	      (CASE S_L.ISTIMEREPORT WHEN 'N' THEN S_L.QTY ELSE 0 END) AS QTY, (CASE S_L.ISTIMEREPORT WHEN 'Y' THEN S_L.QTY ELSE 0 END) AS HORAS, 
+	      (CASE S_L.ISTIMEREPORT WHEN 'N' THEN S_L.QTY ELSE 0 END) AS QTY, (CASE S_L.ISTIMEREPORT WHEN 'Y' THEN C_Uom_Convert(S_L.QTY,C_UOM.C_UOM_ID, (select C_UOM_CONVERSION.C_UOM_TO_ID from C_UOM_CONVERSION WHERE C_UOM_CONVERSION.C_UOM_ID = C_UOM.C_UOM_ID),'Y') ELSE 0 END) AS HORAS, 
 	      (CASE WHEN S_L.DATEEXPENSE IS NULL THEN S.DATEREPORT ELSE S_L.DATEEXPENSE END) AS DATEEXPENSE, 
 	      (CASE WHEN S_L.ISTIMEREPORT ='N' THEN C_CURRENCY_CONVERT(COALESCE(S_L.EXPENSEAMT,0), S_L.C_CURRENCY_ID, ?, (CASE WHEN S_L.DATEEXPENSE IS NULL THEN S.DATEREPORT ELSE S_L.DATEEXPENSE END), NULL, S_L.AD_CLIENT_ID, S_L.AD_ORG_ID) ELSE 0 END) AS INVOICEPRICE, 
-	      AD_MESSAGE_GET2(S.PROCESSED,?) AS PROCESSED, (CASE WHEN S_L.DESCRIPTION IS NULL THEN S.DESCRIPTION ELSE S_L.DESCRIPTION END) AS DESCRIPTION, S_L.S_TIMEEXPENSELINE_ID, S.DOCUMENTNO
+	      AD_MESSAGE_GET2(S.PROCESSED,?) AS PROCESSED, (CASE WHEN S_L.DESCRIPTION IS NULL THEN S.DESCRIPTION ELSE S_L.DESCRIPTION END) AS DESCRIPTION, S_L.S_TIMEEXPENSELINE_ID, S.DOCUMENTNO,C_UOM.C_UOM_ID AS cUomId, '' AS COUNT
       FROM S_TIMEEXPENSE S, C_BPARTNER CBE, M_PRODUCT, C_UOM, S_TIMEEXPENSELINE S_L
       LEFT JOIN C_PROJECT P ON S_L.C_PROJECT_ID = P.C_PROJECT_ID
       LEFT JOIN C_BPARTNER CBC ON S_L.C_BPARTNER_ID = CBC.C_BPARTNER_ID
@@ -71,6 +71,18 @@
      ]]></Sql>
     <Parameter name="cBpartnerId"/>
   </SqlMethod>
+  
+  <SqlMethod name="selectUOM" type="preparedStatement" return="String" default="">
+    <SqlMethodComment></SqlMethodComment>
+    <Sql>
+    <![CDATA[
+      SELECT COUNT(C_UOM_CONVERSION.C_UOM_ID) AS COUNT FROM C_UOM_CONVERSION,C_UOM 
+      WHERE C_UOM_CONVERSION.C_UOM_ID = ?
+      AND C_UOM_CONVERSION.C_UOM_TO_ID = C_UOM.C_UOM_ID
+      AND C_UOM.UOMSYMBOL='h' 
+     ]]></Sql>
+    <Parameter name="cUomId"/>
+  </SqlMethod>
 
   <SqlMethod name="set" type="constant" return="multiple">
       <SqlMethodComment></SqlMethodComment>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.html	Fri Nov 05 11:44:01 2010 +0000
@@ -74,7 +74,11 @@
     setWindowElementFocus(frm.inpDateTo);
     showJSMessage(7);
     return false;
-  } else if (frm.inpcAcctSchemaId.value == null || frm.inpcAcctSchemaId.value == ""){
+  }else if (inputValue(frm.inpOrg)==null || inputValue(frm.inpOrg)=="") {
+      setWindowElementFocus(frm.inpOrg);
+      showJSMessage(7);
+      return false;
+    } else if (frm.inpcAcctSchemaId.value == null || frm.inpcAcctSchemaId.value == ""){
     setWindowElementFocus(frm.inpcAcctSchemaId);
     showJSMessage(7);
     return false;
@@ -90,8 +94,8 @@
 }
 
 function onloadFunctions() {
-  keyArray[keyArray.length] = new keyArrayItem("ENTER", "openSearch(null, null, '../info/AccountElementValue.html', 'SELECTOR_ACCOUNTELEMENTVALUE', false, 'frmMain', 'inpcElementValueIdFrom', 'inpElementValueIdFrom_DES', document.frmMain.inpElementValueIdFrom_DES.value, 'Command', 'KEY');", "inpElementValueIdFrom_DES", "null");
-  keyArray[keyArray.length] = new keyArrayItem("ENTER", "openSearch(null, null, '../info/AccountElementValue.html', 'SELECTOR_ACCOUNTELEMENTVALUE', false, 'frmMain', 'inpcElementValueIdTo', 'inpElementValueIdTo_DES', document.frmMain.inpElementValueIdTo_DES.value, 'Command', 'KEY');", "inpElementValueIdTo_DES", "null");
+  keyArray[keyArray.length] = new keyArrayItem("ENTER", "openSearch(null, null, '../info/AccountElementValue.html', 'SELECTOR_ACCOUNTELEMENTVALUE', false, 'frmMain', 'inpcElementValueIdFrom', 'inpElementValueIdFrom_DES', document.frmMain.inpElementValueIdFrom_DES.value, 'inpcAcctSchemaId', document.frmMain.inpcAcctSchemaId.value);", "inpElementValueIdFrom_DES", "null");
+  keyArray[keyArray.length] = new keyArrayItem("ENTER", "openSearch(null, null, '../info/AccountElementValue.html', 'SELECTOR_ACCOUNTELEMENTVALUE', false, 'frmMain', 'inpcElementValueIdTo', 'inpElementValueIdTo_DES', document.frmMain.inpElementValueIdTo_DES.value, 'inpcAcctSchemaId', document.frmMain.inpcAcctSchemaId.value);", "inpElementValueIdTo_DES", "null");
 }
 
 </script>
@@ -350,7 +354,7 @@
             </tr>
             <tr>
               <td class="TitleCell"><span class="LabelText">Organization</span></td>
-              <td class="Combo_ContentCell" colspan="2"> <select name="inpOrg" id="inpOrg" class="Combo Combo_TwoCells_width">
+              <td class="Combo_ContentCell" colspan="2"> <select name="inpOrg" id="inpOrg" class="ComboKey Combo_TwoCells_width">
                   <option value=""> <div id="reportAD_ORGID"></div></option>
                 </select>
               </td>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJRFilter.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJRFilter.html	Fri Nov 05 11:44:01 2010 +0000
@@ -77,6 +77,11 @@
 			return false;
 		}
 	}
+    if (frm.inpShown.length == 0) {
+        setWindowElementFocus(frm.inpShown);
+        showJSMessage(7);
+        return false;
+    }
 	markCheckedAllElements(frm.inpmProductId_IN);
 	markCheckedAllElements(frm.inpcBPartnerId_IN);
 	markCheckedAllElements(frm.inpShown);
--- a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesFilterJR.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesFilterJR.html	Fri Nov 05 11:44:01 2010 +0000
@@ -76,6 +76,11 @@
 			return false;
 		}
 	}
+    if (frm.inpShown.length == 0) {
+        setWindowElementFocus(frm.inpShown);
+        showJSMessage(7);
+        return false;
+    }
 	markCheckedAllElements(frm.inpmProductId_IN);
 	markCheckedAllElements(frm.inpcBPartnerId_IN);
 	markCheckedAllElements(frm.inpShown);
--- a/src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesFilterJR.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesFilterJR.html	Fri Nov 05 11:44:01 2010 +0000
@@ -76,6 +76,11 @@
 			return false;
 		}
 	}
+    if (frm.inpShown.length == 0) {
+        setWindowElementFocus(frm.inpShown);
+        showJSMessage(7);
+        return false;
+    }
 	markCheckedAllElements(frm.inpmProductId_IN);
 	markCheckedAllElements(frm.inpcBPartnerId_IN);
 	markCheckedAllElements(frm.inpShown);
--- a/src/org/openbravo/erpCommon/ad_reports/ReportProjectProfitabilityJR.java	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportProjectProfitabilityJR.java	Fri Nov 05 11:44:01 2010 +0000
@@ -145,6 +145,14 @@
     }
     strConvRateErrorMsg = myMessage.getMessage();
 
+    for (int i = 0; i < data.length; i++) {
+      String count = ReportExpenseData.selectUOM(this, data[i].cuomid);
+      if (Integer.parseInt(count) == 0) {
+        advisePopUp(request, response, "ERROR", Utility
+            .messageBD(this, "Error", vars.getLanguage()), Utility.messageBD(this,
+            "NoConversionDayUom", vars.getLanguage()));
+      }
+    }
     // If a conversion rate is missing for a certain transaction, an error
     // message window pops-up.
     if (!strConvRateErrorMsg.equals("") && strConvRateErrorMsg != null) {
--- a/src/org/openbravo/erpCommon/ad_reports/ReportProjectProfitability_data.xsql	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportProjectProfitability_data.xsql	Fri Nov 05 11:44:01 2010 +0000
@@ -47,20 +47,20 @@
           COALESCE(EXPEXP.AMOUNT,0) AS REALEXPENSES,
 
           COALESCE(COLLECTED.AMOUNT,0) AS COLLECTED, 
-          '' AS NODE_ID, '' AS ISSUMMARY
+          '' AS NODE_ID, '' AS ISSUMMARY ,COST.cUomId AS cUomId, '' AS COUNT
         FROM C_BPartner bpclient, AD_Org org, 
           C_Project p LEFT JOIN C_BPartner bpresp ON  p.Responsible_ID = bpresp.C_BPartner_ID
                       LEFT JOIN C_Projecttype pt ON pt.C_Projecttype_ID = p.C_Projecttype_ID 
                       LEFT JOIN (SELECT S_TimeExpenseLine.C_Project_ID, 
-         SUM((CASE S_TimeExpenseLine.IsTimereport WHEN 'Y' THEN S_TimeExpenseLine.qty ELSE 0 END)*
-         C_CURRENCY_CONVERT(C_CALCULATECOST_CATSALARY(C_CALCULATE_CATSALARY(C_BPartner.c_bpartner_id, TO_DATE(COALESCE(S_TimeExpenseLine.DATEEXPENSE, s_timeexpense.DATEREPORT))), TO_DATE(COALESCE(S_TimeExpenseLine.DATEEXPENSE, s_timeexpense.DATEREPORT))),
-         ?, ?, TO_DATE(COALESCE(S_TimeExpenseLine.DATEEXPENSE, s_timeexpense.DATEREPORT)), NULL, S_TimeExpenseLine.AD_CLIENT_ID, S_TimeExpenseLine.AD_ORG_ID)) AS cost
-           FROM S_TimeExpenseLine , S_TimeExpense, C_BPartner
+         SUM((CASE S_TimeExpenseLine.IsTimereport WHEN 'Y' THEN C_Uom_Convert(S_TimeExpenseLine.qty,C_UOM.C_UOM_ID, (select C_UOM_CONVERSION.C_UOM_TO_ID from C_UOM_CONVERSION WHERE C_UOM_CONVERSION.C_UOM_ID = C_UOM.C_UOM_ID),'Y') ELSE 0 END)*C_CURRENCY_CONVERT(C_CALCULATECOST_CATSALARY(C_CALCULATE_CATSALARY(C_BPartner.c_bpartner_id, TO_DATE(COALESCE(S_TimeExpenseLine.DATEEXPENSE, s_timeexpense.DATEREPORT))), TO_DATE(COALESCE(S_TimeExpenseLine.DATEEXPENSE, s_timeexpense.DATEREPORT))),
+         ?, ?, TO_DATE(COALESCE(S_TimeExpenseLine.DATEEXPENSE, s_timeexpense.DATEREPORT)), NULL, S_TimeExpenseLine.AD_CLIENT_ID, S_TimeExpenseLine.AD_ORG_ID)) AS cost,C_UOM.C_UOM_ID AS cUomId
+           FROM S_TimeExpenseLine , S_TimeExpense, C_BPartner, C_Uom
            WHERE S_TimeExpense.S_TimeExpense_ID = S_TimeExpenseLine.S_TimeExpense_ID
            AND S_TimeExpense.C_BPartner_ID = C_BPartner.C_BPartner_ID
+           AND S_TimeExpenseLine.C_UOM_ID = C_UOM.C_UOM_ID
            AND S_TimeExpense.Processed = 'Y'
            AND 1=1            
-           GROUP BY S_TimeExpenseLine.C_Project_ID) cost ON p.C_Project_ID = cost.C_Project_ID
+           GROUP BY S_TimeExpenseLine.C_Project_ID,C_UOM.C_UOM_ID) cost ON p.C_Project_ID = cost.C_Project_ID
 
                       LEFT JOIN (SELECT c_Project, sum(amount) as amount
            FROM (
@@ -290,4 +290,15 @@
     <Parameter name="adOrgId"/>
     <Parameter name="adClientId"/>
   </SqlMethod>
+   <SqlMethod name="selectUOM" type="preparedStatement" return="String" default="">
+    <SqlMethodComment></SqlMethodComment>
+    <Sql>
+    <![CDATA[
+      SELECT COUNT(C_UOM_CONVERSION.C_UOM_ID) AS COUNT FROM C_UOM_CONVERSION,C_UOM 
+      WHERE C_UOM_CONVERSION.C_UOM_ID = ?
+      AND C_UOM_CONVERSION.C_UOM_TO_ID = C_UOM.C_UOM_ID
+      AND C_UOM.UOMSYMBOL='h'
+     ]]></Sql>
+    <Parameter name="cUomId"/>
+  </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportPurchaseDimensionalAnalysesFilterJR.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportPurchaseDimensionalAnalysesFilterJR.html	Fri Nov 05 11:44:01 2010 +0000
@@ -76,6 +76,11 @@
 			return false;
 		}
 	}
+    if (frm.inpShown.length == 0) {
+        setWindowElementFocus(frm.inpShown);
+        showJSMessage(7);
+        return false;
+    }
 	markCheckedAllElements(frm.inpmProductId_IN);
 	markCheckedAllElements(frm.inpcBPartnerId_IN);
 	markCheckedAllElements(frm.inpShown);
--- a/src/org/openbravo/erpCommon/ad_reports/ReportRefundSalesDimensionalAnalysesFilter.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportRefundSalesDimensionalAnalysesFilter.html	Fri Nov 05 11:44:01 2010 +0000
@@ -86,6 +86,11 @@
 			return false;
 		}
 	}
+    if (frm.inpShown.length == 0) {
+        setWindowElementFocus(frm.inpShown);
+        showJSMessage(7);
+        return false;
+    }
 	markCheckedAllElements(frm.inpmProductId_IN);
 	markCheckedAllElements(frm.inpcBPartnerId_IN);
 	markCheckedAllElements(frm.inpShown);
--- a/src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJRFilter.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJRFilter.html	Fri Nov 05 11:44:01 2010 +0000
@@ -80,6 +80,11 @@
 			return false;
 		}
 	}
+    if (frm.inpShown.length == 0) {
+        setWindowElementFocus(frm.inpShown);
+        showJSMessage(7);
+        return false;
+    }
 	markCheckedAllElements(frm.inpmProductId_IN);
 	markCheckedAllElements(frm.inpcBPartnerId_IN);
 	markCheckedAllElements(frm.inpShown);
--- a/src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderInvoiced_data.xsql	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderInvoiced_data.xsql	Fri Nov 05 11:44:01 2010 +0000
@@ -60,7 +60,7 @@
       GROUP BY COALESCE(CB.NAME, C_BPARTNER.NAME), C_PROJECT.VALUE, C_PROJECT.NAME, M_PRODUCT.NAME, C_UOM.NAME, C_ORDERLINE.PRICEACTUAL,
       COALESCE(C_ORDERLINE.C_CURRENCY_ID, C_ORDER.C_CURRENCY_ID), TO_DATE(COALESCE(C_ORDERLINE.DATEORDERED, C_ORDER.DATEORDERED, NOW())),	  
 	  C_ORDERLINE.AD_CLIENT_ID, C_ORDERLINE.AD_ORG_ID, C_DOCTYPE.DOCBASETYPE	
-      HAVING SUM(C_ORDERLINE.QTYDELIVERED) > 0
+      HAVING SUM(C_ORDERLINE.QTYINVOICED) > 0
       ORDER BY COALESCE(CB.NAME, C_BPARTNER.NAME), C_PROJECT.NAME, M_PRODUCT.NAME
     ]]></Sql>
     <Parameter name="cCurrencyConv"/>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJRFilter.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJRFilter.html	Fri Nov 05 11:44:01 2010 +0000
@@ -87,6 +87,11 @@
 			return false;
 		}
 	}
+    if (frm.inpShown.length == 0) {
+        setWindowElementFocus(frm.inpShown);
+        showJSMessage(7);
+        return false;
+    }
 	markCheckedAllElements(frm.inpmProductId_IN);
 	markCheckedAllElements(frm.inpcBPartnerId_IN);
 	markCheckedAllElements(frm.inpShown);
--- a/src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java	Fri Nov 05 11:44:01 2010 +0000
@@ -1337,6 +1337,10 @@
     String strXml = Utility.fileToString(datasetFile.getPath());
     myResult = myData.importDataFromXML(client, organization, strXml, dataset.getModule());
 
+    if (myResult.getErrorMessages() != null && !myResult.getErrorMessages().equals("")
+        && !myResult.getErrorMessages().equals("null"))
+      return myResult;
+
     insertClientModule(client, dataset.getModule());
 
     return myResult;
--- a/src/org/openbravo/erpCommon/security/Login_F1.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/security/Login_F1.html	Fri Nov 05 11:44:01 2010 +0000
@@ -76,7 +76,7 @@
 }
 
 function redirectWhenInsideMDI() {
-  if (isWindowInMDITab) {
+  if (typeof isWindowInMDIPage !== "undefined" && isWindowInMDIPage) {
     var LayoutMDI = getFrame('LayoutMDI');
     if (LayoutMDI && typeof parent.document.getElementById('framesetMenu') === "object") {
       LayoutMDI.location.href = parent.window.location.href;
@@ -121,7 +121,7 @@
       clearForm();
     } catch (e) {}
     setWindowElementFocus('firstElement');
-    if ((!revisionControl('8742')) || (isOpsInstance() != isOpsInstanceCached())) {
+    if ((!revisionControl('8794')) || (isOpsInstance() != isOpsInstanceCached())) {
       alert(cacheMsg);
     }
 
--- a/src/org/openbravo/erpCommon/utility/Home.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/utility/Home.html	Fri Nov 05 11:44:01 2010 +0000
@@ -34,12 +34,20 @@
     var divPurpose = document.getElementById('cbPurpose');
     if (purposeCode == 'D') {
       divPurpose.className = 'Login_Home_Community_Branding_development';
+      divPurpose.title = '';
+      divPurpose.alt = '';
     } else if (purposeCode == 'P') {
       divPurpose.className = 'Login_Home_Community_Branding_production';
+      divPurpose.title = '';
+      divPurpose.alt = '';
     } else if (purposeCode == 'T') {
       divPurpose.className = 'Login_Home_Community_Branding_testing';
+      divPurpose.title = '';
+      divPurpose.alt = '';
     } else if (purposeCode == 'E') {
       divPurpose.className = 'Login_Home_Community_Branding_evaluation';
+      divPurpose.title = '';
+      divPurpose.alt = '';
     } else {
       divPurpose.className = 'Login_Home_Community_Branding_unknown';
     }
@@ -51,7 +59,7 @@
       return;
     }
     if(typeof internetConnection !== 'undefined') {
-      iframe.src = communityBrandingUrl;
+      iframe.src = document.location.protocol + communityBrandingUrl;
       return;
     }
     iframe.src = staticUrl;
@@ -130,7 +138,7 @@
                 <div id="communityBranding" class="Login_Home_Community_Branding" border="0">
                   <div class="Login_Home_Community_Branding_top"></div>
                   <div class="Login_Home_Community_Branding_title">
-                    <div class="Login_Home_Community_Branding_purpose" id="cbPurpose"></div>
+                    <div class="Login_Home_Community_Branding_purpose" alt="" title="" id="cbPurpose"></div>
                     <div class="Login_Home_Community_Branding_version" id="cbVersion">xx2.50 - Community Edition - MP23</div>
                   </div>
                   <div class="Login_Home_Community_Branding_iframe">
--- a/src/org/openbravo/erpCommon/utility/Home.java	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/utility/Home.java	Fri Nov 05 11:44:01 2010 +0000
@@ -37,7 +37,7 @@
 
 public class Home extends HttpSecureAppServlet {
   private static final long serialVersionUID = 1L;
-  private static final String COMMUNITY_BRANDING_URL = "http://butler.openbravo.com/heartbeat-server/org.openbravo.butler.communitybranding/CommunityBranding.html";
+  private static final String COMMUNITY_BRANDING_URL = "//butler.openbravo.com/heartbeat-server/org.openbravo.butler.communitybranding/CommunityBranding.html";
   private static final String STATIC_COMMUNITY_BRANDING_URL = "StaticCommunityBranding.html";
   private static final String BUTLER_UTILS_URL = "//butler.openbravo.com/web/static-content/js/ob-utils.js";
 
@@ -78,6 +78,8 @@
     String strPurpose = getPurpose();
     if (strPurpose == null) {
       strPurpose = "unknown";
+      xmlDocument.setParameter("cbPurposeTooltip", Utility.messageBD(myPool,
+          "Home_Purpose_Tooltip", vars.getLanguage()));
     }
     xmlDocument.setParameter("cbPurpose", strPurpose.toLowerCase());
     xmlDocument.setParameter("cbVersion", getVersion());
--- a/src/org/openbravo/erpCommon/utility/Home.xml	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/utility/Home.xml	Fri Nov 05 11:44:01 2010 +0000
@@ -27,5 +27,7 @@
   <PARAMETER id="customJS" name="customJS" default="" />
   <PARAMETER id="fieldUrls" name="urls" />
   <PARAMETER id="cbPurpose" name="cbPurpose" attribute="class" replace="purpose"/>
+  <PARAMETER id="cbPurpose" name="cbPurposeTooltip" attribute="alt"/>
+  <PARAMETER id="cbPurpose" name="cbPurposeTooltip" attribute="title"/>
   <PARAMETER id="cbVersion" name="cbVersion"/>
 </REPORT>
--- a/src/org/openbravo/erpCommon/utility/HttpsUtils.java	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/utility/HttpsUtils.java	Fri Nov 05 11:44:01 2010 +0000
@@ -238,7 +238,7 @@
         return false;
       }
     } catch (Exception e) {
-      log4j.error("Unable to reach butler.openbravo.com", e);
+      log4j.info("Unable to reach butler.openbravo.com");
       return false;
     }
     return true;
--- a/src/org/openbravo/erpCommon/utility/SystemInfo.java	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/utility/SystemInfo.java	Fri Nov 05 11:44:01 2010 +0000
@@ -79,7 +79,8 @@
   private static Date lastLogin;
   private static Long numberOfLogins;
   private static SimpleDateFormat sd;
-  private static int numberOfLonginsThisMoth = 0;
+  private static int numberOfLoginsThisMonth = 0;
+  private static int numberOfRejectedLoginsDueConcUsersThisMonth = 0;
   private static BigDecimal avgUsers = BigDecimal.ZERO;
   private static BigDecimal usagePercentageTime = BigDecimal.ZERO;
   private static int maxUsers = 0;
@@ -193,6 +194,9 @@
     case OBPS_INSTANCE:
       systemInfo.put(i, getOBPSInstance());
       break;
+    case INSTANCE_NUMBER:
+      systemInfo.put(i, getOBPSIntanceNumber());
+      break;
     case FIRST_LOGIN:
       systemInfo.put(i, sd.format(firstLogin));
       break;
@@ -212,7 +216,7 @@
       systemInfo.put(i, usagePercentageTime.toString());
       break;
     case TOTAL_LOGINS_LAST_MOTH:
-      systemInfo.put(i, Integer.toString(numberOfLonginsThisMoth));
+      systemInfo.put(i, Integer.toString(numberOfLoginsThisMonth));
       break;
     case NUMBER_OF_CLIENTS:
       systemInfo.put(i, getNumberOfClients());
@@ -228,6 +232,9 @@
           .getInstancePurpose();
       systemInfo.put(i, instancePurpose == null ? "U" : instancePurpose);
       break;
+    case REJECTED_LOGINS_DUE_CONC_USERS:
+      systemInfo.put(i, Integer.toString(numberOfRejectedLoginsDueConcUsersThisMonth));
+      break;
     }
   }
 
@@ -556,6 +563,17 @@
   }
 
   /**
+   * In case it is an OBPS instance, it returns the number of instance
+   */
+  private static String getOBPSIntanceNumber() {
+    if (ActivationKey.getInstance().isOPSInstance()) {
+      return ActivationKey.getInstance().getProperty("instanceno");
+    } else {
+      return "";
+    }
+  }
+
+  /**
    * Reads all information about session:
    * <ul>
    * <li>First and last login in the instance
@@ -597,7 +615,7 @@
       List<Event> events = new ArrayList<Event>();
       List<Session> sessions = qSession.list();
 
-      numberOfLonginsThisMoth = sessions.size();
+      numberOfLoginsThisMonth = sessions.size();
       for (Session session : sessions) {
         Event newSession = new Event();
         newSession.eventDate = session.getCreationDate();
@@ -641,6 +659,7 @@
           usersPeriod = usersPeriod.add(periodTime.multiply(new BigDecimal(concurrentUsers)));
         }
       }
+      calculateNumberOfRejectedLoginsDueConcurrentUsersLastMonth(startOfPeriod);
 
       BigDecimal totalTime = new BigDecimal(now.getTimeInMillis() - startOfPeriod.getTimeInMillis());
       if (totalUsageTime.compareTo(BigDecimal.ZERO) != 0) {
@@ -655,6 +674,16 @@
     } catch (Exception e) {
       log4j.error("Error calculating login information", e);
     }
+
+  }
+
+  private static void calculateNumberOfRejectedLoginsDueConcurrentUsersLastMonth(
+      Calendar startOfPeriod) {
+    OBCriteria<Session> qSession = OBDal.getInstance().createCriteria(Session.class);
+    qSession.add(Expression.ge(Session.PROPERTY_CREATIONDATE, startOfPeriod.getTime()));
+    qSession.add(Expression.eq(Session.PROPERTY_LOGINSTATUS, "CUR"));
+
+    numberOfRejectedLoginsDueConcUsersThisMonth = qSession.count();
   }
 
   /**
@@ -710,7 +739,8 @@
         "loginsMoth", false), MAX_CONCURRENT_USERS("maxUsers", false), AVG_CONCURRENT_USERS(
         "avgUsers", false), PERC_TIME_USAGE("timeUsage", false), NUMBER_OF_CLIENTS("clientNum",
         false), NUMBER_OF_ORGS("orgNum", false), USAGE_AUDIT("usageAudit", false), INSTANCE_PURPOSE(
-        "instancePurpose", false);
+        "instancePurpose", false), REJECTED_LOGINS_DUE_CONC_USERS("rejectedLoginsDueConcUsers",
+        false), INSTANCE_NUMBER("instanceNo", false);
 
     private String label;
     private boolean isIdInfo;
--- a/src/org/openbravo/erpCommon/utility/Utility.java	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/utility/Utility.java	Fri Nov 05 11:44:01 2010 +0000
@@ -2672,6 +2672,22 @@
       } else if ("banner-production".equals(logo)) {
         img = OBDal.getInstance().get(SystemInformation.class, "0").getProductionBannerImage();
         return defaultImageLogo(img, "web/images/blank.gif");
+      } else if ("yourcompanylegal".equals(logo)) {
+        if (org != null && !org.equals("")) {
+          Organization organization = OBDal.getInstance().get(Organization.class, org);
+          img = organization.getOrganizationInformationList().get(0).getYourCompanyDocumentImage();
+        }
+        if (img == null) {
+
+          img = OBDal.getInstance().get(ClientInformation.class,
+              OBContext.getOBContext().getCurrentClient().getId()).getYourCompanyDocumentImage();
+
+          if (img == null) {
+            img = OBDal.getInstance().get(SystemInformation.class, "0")
+                .getYourCompanyDocumentImage();
+          }
+        }
+        return defaultImageLogo(img, "web/images/CompanyLogo_big.png");
       } else {
         log4j.error("Logo key does not exist: " + logo);
         return getBlankImage();
--- a/src/org/openbravo/erpCommon/utility/VerticalMenu.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/utility/VerticalMenu.html	Fri Nov 05 11:44:01 2010 +0000
@@ -102,7 +102,7 @@
       function updateAlert()
       {
           setMDIEnvironment();
-          if(isWindowInMDITab || isWindowInMDIContext) {
+          if(isWindowInMDIContext) {
             return;
           }
 
--- a/src/org/openbravo/erpReports/C_OrderJR.jrxml	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpReports/C_OrderJR.jrxml	Fri Nov 05 11:44:01 2010 +0000
@@ -359,7 +359,7 @@
 						</reportElement>
 					<box></box>
 					<graphicElement stretchType="NoStretch"/>
-					<imageExpression class="java.awt.Image"><![CDATA[org.openbravo.erpCommon.utility.Utility.showImageLogo("yourcompanydoc", $F{ORGANIZATIONID})]]></imageExpression>
+					<imageExpression class="java.awt.Image"><![CDATA[org.openbravo.erpCommon.utility.Utility.showImageLogo("yourcompanylegal", $F{ORGANIZATIONID})]]></imageExpression>
 				</image>
 				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
--- a/src/org/openbravo/erpReports/RptC_Invoice.jrxml	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpReports/RptC_Invoice.jrxml	Fri Nov 05 11:44:01 2010 +0000
@@ -432,7 +432,7 @@
 					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 </box>
 					<graphicElement stretchType="NoStretch"/>
-					<imageExpression class="java.awt.Image"><![CDATA[org.openbravo.erpCommon.utility.Utility.showImageLogo("yourcompanydoc", $F{ORGANIZATIONID})]]></imageExpression>
+					<imageExpression class="java.awt.Image"><![CDATA[org.openbravo.erpCommon.utility.Utility.showImageLogo("yourcompanylegal", $F{ORGANIZATIONID})]]></imageExpression>
 				</image>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
--- a/src/org/openbravo/erpReports/RptC_OrderPO.jrxml	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpReports/RptC_OrderPO.jrxml	Fri Nov 05 11:44:01 2010 +0000
@@ -323,7 +323,7 @@
 					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 </box>
 					<graphicElement stretchType="NoStretch"/>
-					<imageExpression class="java.awt.Image"><![CDATA[org.openbravo.erpCommon.utility.Utility.showImageLogo("yourcompanydoc", $F{ORGANIZATIONID})]]></imageExpression>
+					<imageExpression class="java.awt.Image"><![CDATA[org.openbravo.erpCommon.utility.Utility.showImageLogo("yourcompanylegal", $F{ORGANIZATIONID})]]></imageExpression>
 				</image>
 				<line direction="TopDown">
 					<reportElement
--- a/src/org/openbravo/erpReports/RptM_InOut.jrxml	Thu Nov 04 21:11:37 2010 +0100
+++ b/src/org/openbravo/erpReports/RptM_InOut.jrxml	Fri Nov 05 11:44:01 2010 +0000
@@ -386,7 +386,7 @@
 						</reportElement>
 					<box></box>
 					<graphicElement stretchType="NoStretch"/>
-					<imageExpression class="java.awt.Image"><![CDATA[org.openbravo.erpCommon.utility.Utility.showImageLogo("yourcompanydoc", $F{organizationid})]]></imageExpression>
+					<imageExpression class="java.awt.Image"><![CDATA[org.openbravo.erpCommon.utility.Utility.showImageLogo("yourcompanylegal", $F{organizationid})]]></imageExpression>
 				</image>
 				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
--- a/web/html/en_US/StaticCommunityBranding-2.50-Basic.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/web/html/en_US/StaticCommunityBranding-2.50-Basic.html	Fri Nov 05 11:44:01 2010 +0000
@@ -23,12 +23,12 @@
 </div>
 
 <div style="float: left; width: 408px; height: 148px; background: url(&quot;http://www.openbravo.com/img-corp/consola/fondo-dch.png&quot;) no-repeat scroll 0% 0% transparent;">
-  <h1 style="border-bottom: 1px dotted rgb(88, 166, 24); margin-left: 15px; margin-top: 10px; margin-right: 5px;">Time to take your business to the next level?<br>
+  <h1 style="border-bottom: 1px dotted rgb(88, 166, 24); margin-left: 15px; margin-top: 10px; margin-right: 5px;">Take your business to the next level!<br>
 </h1>
   
-<p style="margin-top: -8px; margin-left: 15px;">Thank you for subscribing. As a Basic Edition customer you experience the 
+<p style="margin-top: -8px; margin-left: 15px; margin-right: 10px;">Thank you for subscribing. As a Basic Edition customer you experience the 
 value of easily keeping your ERP up to date, extending it with new 
-modules, and quickly adding custom tabs and fields to your screens.&nbsp; 
+modules, and quickly adapting your screens.&nbsp; 
 Now you can get even more strategic value by choosing an accredited service provider in Openbravo's global <a href="http://www.openbravo.com/partners/find-partners-support/" target="_blank">partner network</a>. For more information<a href="http://www.openbravo.com/partners/find-partners-support/" target="_blank"></a>, please&nbsp; <a href="http://www.openbravo.com/form/customer/" target="_blank">contact us</a>. <a href="http://exchange.openbravo.com/" target="_blank"><br>
 </a><a href="http://exchange.openbravo.com/" target="_blank">
 </a></p>
@@ -43,4 +43,4 @@
   <a href="http://www.openbravo.com/product/erp/community-professional/" target="_blank"><img src="StaticCommunityBranding-2.50-Basic_files/banner.png" style="margin-left: 7px; margin-top: -30px;" border="0"></a>
 </div>
 
-</body></html>
\ No newline at end of file
+</body></html>
--- a/web/html/en_US/StaticCommunityBranding-2.50-Comm.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/web/html/en_US/StaticCommunityBranding-2.50-Comm.html	Fri Nov 05 11:44:01 2010 +0000
@@ -23,10 +23,10 @@
 </div>
 
 <div style="float: left; width: 408px; height: 148px; background: url(&quot;http://www.openbravo.com/img-corp/consola/fondo-dch.png&quot;) no-repeat scroll 0% 0% transparent;">
-  <h1 style="border-bottom: 1px dotted rgb(88, 166, 24); margin-left: 15px; margin-top: 10px; margin-right: 5px;">Extend your ERP with Module Management<br>
+  <h1 style="border-bottom: 1px dotted rgb(88, 166, 24); margin-left: 15px; margin-top: 10px; margin-right: 5px;">Extend your ERP with modules<br>
 </h1>
   
-<p style="margin-top: -8px; margin-left: 15px;">Discover the power of the Openbravo ecosystem
+<p style="margin-top: -8px; margin-left: 15px; margin-right: 10px;">Discover the power of the Openbravo ecosystem
  and extend your Openbravo system with modules. <a href="http://wiki.openbravo.com/wiki/ERP/2.50/Configuration_Manual/Personalizing_Openbravo_ERP#Installing_a_module_from_the_Central_Repository" target="_blank">These 
 instructions</a> will get you started exploring the many available modules that will save you time &amp; money and increase the
  power of your organization. For more information or to be put into contact with an accredited <a href="http://www.openbravo.com/partners/find-partners-support/" target="_blank">Openbravo partner</a>, please <a href="http://www.openbravo.com/form/customer/" target="_blank">contact us</a>.<a href="http://exchange.openbravo.com/" target="_blank"><br>
--- a/web/html/en_US/StaticCommunityBranding-2.50-STD.html	Thu Nov 04 21:11:37 2010 +0100
+++ b/web/html/en_US/StaticCommunityBranding-2.50-STD.html	Fri Nov 05 11:44:01 2010 +0000
@@ -27,11 +27,11 @@
   <h1 style="border-bottom: 1px dotted rgb(88, 166, 24); margin-left: 15px; margin-top: 10px; margin-right: 5px;">Openbravo Professional Edition Benefits<br>
 </h1>
   
-<p style="margin-top: -8px; margin-left: 15px;">Thank you for your subscription, which entitles you to these benefits:</p>
-<p style="margin-top: -8px; margin-left: 15px;">&nbsp;- Full access to exclusive functionality</p>
-<p style="margin-top: -8px; margin-left: 15px;">&nbsp;- Support, maintenance and warranties</p>
-<p style="margin-top: -8px; margin-left: 15px;">&nbsp;- Access to services from Openbravo-accredited professionals</p>
-<p style="margin-top: -8px; margin-left: 15px;">Please <a href="mailto:collaborate@openbravo.com">share</a> your success story with us!</p>
+<p style="margin-top: -8px; margin-left: 15px; margin-right: 10px;">Thank you for your subscription, which entitles you to:</p>
+<p style="margin-top: -8px; margin-left: 15px; margin-right: 10px;">&nbsp;- Full access to exclusive functionality</p>
+<p style="margin-top: -8px; margin-left: 15px; margin-right: 10px;">&nbsp;- Support, maintenance and warranties</p>
+<p style="margin-top: -8px; margin-left: 15px; margin-right: 10px;">&nbsp;- Access to services from Openbravo-accredited professionals</p>
+<p style="margin-top: -8px; margin-left: 15px; margin-right: 10px;">Please <a href="mailto:collaborate@openbravo.com">share</a> your success story with us!</p>
 
 </div>
 
@@ -39,10 +39,10 @@
 
 <div style="float: left; width: 563px; height: 135px; background: url(&quot;http://www.openbravo.com/img-corp/consola/fondo-bajo.png&quot;) no-repeat scroll 0% 0% transparent; margin-top: 10px;">
   <h1 style="border-bottom: 1px dotted rgb(88, 166, 24); margin-left: 15px; margin-top: 10px; margin-right: 15px;">Extend your ERP with Openbravo Exchange<a href="http://www.openbravo.com/product/erp/community-professional/" target="_blank"></a></h1>&nbsp;
-  <p style="margin-top: -25px; margin-left: 15px;">&nbsp;&nbsp;<a href="http://exchange.openbravo.com" target="_blank">Openbravo Exchange</a> is the marketplace to find packaged modules and<br>
+  <p style="margin-top: -25px; margin-left: 15px; margin-right: 10px;">&nbsp;&nbsp;<a href="http://exchange.openbravo.com" target="_blank">Openbravo Exchange</a> is the marketplace to find packaged modules and<br>
 &nbsp; industry solutions that can be installed directly from the browser. Save time and&nbsp; <br>
 &nbsp; money by extending Openbravo Professional Edition the easy way.<br></p>
 
 </div>
 
-</body></html>
\ No newline at end of file
+</body></html>
--- a/web/js/messages.js	Thu Nov 04 21:11:37 2010 +0100
+++ b/web/js/messages.js	Fri Nov 05 11:44:01 2010 +0000
@@ -41,15 +41,15 @@
 
   if(typeof getFrame === 'function' && getFrame('frameMenu')) {
     arrMessages = getFrame('frameMenu').arrMessages;
-    arrTypes = getFrame('frameMenu').arrTypes;		
+    arrTypes = getFrame('frameMenu').arrTypes;
   } else {
-    if (parent.frameMenu) {
+    if (parent && parent.frameMenu) {
       arrMessages = parent.frameMenu.arrMessages;
       arrTypes = parent.frameMenu.arrTypes;
-    } else if (top.opener.parent.frameMenu) {
+    } else if (top && top.opener && top.opener.parent && top.opener.parent.frameMenu) {
       arrMessages = top.opener.parent.frameMenu.arrMessages;
       arrTypes = top.opener.parent.frameMenu.arrTypes;
-    } else if (top.opener.top.opener.parent.frameMenu) {
+    } else if (top && top.opener && top.opener.top && top.opener.top.opener && top.opener.top.opener.parent && top.opener.top.opener.parent.frameMenu) {
       arrMessages = top.opener.top.opener.parent.frameMenu.arrMessages;
       arrTypes = top.opener.top.opener.parent.frameMenu.arrTypes;
     }
--- a/web/js/shortcuts.js	Thu Nov 04 21:11:37 2010 +0100
+++ b/web/js/shortcuts.js	Fri Nov 05 11:44:01 2010 +0000
@@ -149,7 +149,7 @@
       );
   } else if (type=='popupSpecificKeys') {
       this.keyArray.splice(keyArray.length-1, 0,
-        new keyArrayItem("ESCAPE", "parent.window.close();", null, null, false, 'onkeydown'),
+        new keyArrayItem("ESCAPE", "closePage();", null, null, false, 'onkeydown'),
         new keyArrayItem("ENTER", "xx();", null, "shiftKey", false, 'onkeydown')
       );
   }
--- a/web/js/utils.js	Thu Nov 04 21:11:37 2010 +0100
+++ b/web/js/utils.js	Fri Nov 05 11:44:01 2010 +0000
@@ -26,16 +26,21 @@
  * Code that will be executed once the file is parsed
 */
 function utilsJSDirectExecution() {
+  isWindowInMDIPopup = checkWindowInMDIPopup();
   isWindowInMDITab = checkWindowInMDITab();
+  isWindowInMDIPage = checkWindowInMDIPage();
   isWindowInMDIContext = checkWindowInMDIContext();
   if (isWindowInMDITab) {
     adaptSkinToMDIEnvironment();
   }
 }
 
+var isWindowInMDIPopup = false;
 var isWindowInMDITab = false;
+var isWindowInMDIPage = false;
 var isWindowInMDIContext = false;
 var isMDIEnvironmentSet = false;
+var MDIPopupId = null;
 
 var baseFrameServlet = "../security/Login_FS.html";
 var gColorSelected = "#c0c0c0";
@@ -45,6 +50,7 @@
 var defaultDateFormat = "%d-%m-%Y";
 
 var mainFrame_windowObj = "";
+var LayoutMDI_windowObj = "";
 
 //Days of a Month
 var daysOfMonth = [[0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31],  //No leap year
@@ -89,7 +95,7 @@
 * Return a number that would be checked at the Login screen to know if the file is cached with the correct version
 */
 function getCurrentRevision() {
-  var number = '8742';
+  var number = '8794';
   return number;
 }
 
@@ -904,6 +910,7 @@
   return text;
 }
 
+var openPopUpMDICheck = false;
 /**
 * Opens a pop-up window and adds custom properties to it 
 * @param {String} url This is the URL to be loaded in the newly opened window.
@@ -923,7 +930,7 @@
 * @see #getArrayValue 
 * @see #submitCommandForm
 */
-function openPopUp(url, _name, height, width, top, left, checkChanges, target, doSubmit, closeControl, parameters, hasLoading) {
+function openPopUp(url, _name, height, width, top, left, checkChanges, target, doSubmit, closeControl, parameters, hasLoading, openInMDIPopup) {
   var appUrl = getAppUrl();
   var adds = "";
   var isPopup = null;
@@ -974,6 +981,22 @@
   if (doSubmit && (getArrayValue(parameters, "debug", false)==true)) {
     if (!depurar_validate_wrapper(getArrayValue(parameters, "Command", "DEFAULT"), null, "")) return false;
   }
+
+  if (isWindowInMDIPage && openInMDIPopup && isPopup == true) {
+    if (getFrame('LayoutMDI') && getFrame('LayoutMDI').OB && getFrame('LayoutMDI').OB.Layout && getFrame('LayoutMDI').OB.Layout.ClassicOBCompatibility && getFrame('LayoutMDI').OB.Layout.ClassicOBCompatibility.Popup && getFrame('LayoutMDI').OB.Layout.ClassicOBCompatibility.Popup.open) {
+      if (!openPopUpMDICheck) {
+        getFrame('LayoutMDI').OB.Layout.ClassicOBCompatibility.Popup.open(_name, width, height, "", "", window);
+        openPopUpMDICheck = true;
+      }
+
+      if (!getFrame('LayoutMDI').OB.Layout.ClassicOBCompatibility.Popup.isLoaded(_name)) {
+        setTimeout(function() { openPopUp(url, _name, height, width, top, left, checkChanges, target, doSubmit, closeControl, parameters, hasLoading, openInMDIPopup); }, 50);
+        return true;
+      }
+      openPopUpMDICheck = false;
+    }
+  }
+
   if (isPopup == true && hasLoading == true) {
     isPopupLoadingWindowLoaded=false;
     var urlLoading = appUrl + '/utility/PopupLoading.html';
@@ -1162,14 +1185,14 @@
 * @see #openPopUp 
 * @see #addArrayValue
 */
-function openHelp(windowId, url, _name, checkChanges, height, width, windowType, windowName) {
+function openHelp(windowId, url, _name, checkChanges, height, width, windowType, windowName, openInMDIPopup) {
   if (height==null) height = 450;
   if (width==null) width = 700;
   var parameters = new Array();
   parameters = addArrayValue(parameters, "inpwindowId", windowId, true);
   parameters = addArrayValue(parameters, "inpwindowType", windowType, true);
   parameters = addArrayValue(parameters, "inpwindowName", windowName, true);
-  return openPopUp(url, _name, height, width, null, null, checkChanges, null, null, true, parameters);
+  return openPopUp(url, _name, height, width, null, null, checkChanges, null, null, true, parameters, null, openInMDIPopup);
 }
 
 /**
@@ -1183,7 +1206,7 @@
 * @see #openPopUp 
 * @see #addArrayValue
 */
-function openServletNewWindow(Command, bolValidation, url, _name, processId, checkChanges, height, width, resizable, hasStatus, closeControl, hasLoading) {
+function openServletNewWindow(Command, bolValidation, url, _name, processId, checkChanges, height, width, resizable, hasStatus, closeControl, hasLoading, openInMDIPopup) {
   if (height==null) height = 350;
   if (width==null) width = 500;
   if (closeControl==null) closeControl = true;
@@ -1192,11 +1215,10 @@
   parameters = addArrayValue(parameters, "debug", bolValidation, false);
   if (processId!=null && processId!="") parameters = addArrayValue(parameters, "inpProcessId", processId, true);
   if (Command!=null && Command!="") parameters = addArrayValue(parameters, "Command", Command, false);
-
   if (navigator.userAgent.toUpperCase().indexOf("MSIE") != -1) {
-    setTimeout(function() {return openPopUp(url, _name, height, width, null, null, checkChanges, null, true, closeControl, parameters, hasLoading);},10);
+    setTimeout(function() {return openPopUp(url, _name, height, width, null, null, checkChanges, null, true, closeControl, parameters, hasLoading, openInMDIPopup);},10);
   } else {
-    return openPopUp(url, _name, height, width, null, null, checkChanges, null, true, closeControl, parameters, hasLoading);
+    return openPopUp(url, _name, height, width, null, null, checkChanges, null, true, closeControl, parameters, hasLoading, openInMDIPopup);
   }
 }
 
@@ -1228,13 +1250,13 @@
 * @see #openPopUp 
 * @see #addArrayValue
 */
-function editHelp(url, type, id, value, height, width) {
+function editHelp(url, type, id, value, height, width, openInMDIPopup) {
   if (height==null) height = 500;
   if (width==null) width = 600;
   var parameters = new Array();
   parameters = addArrayValue(parameters, "Command", type, true);
   parameters = addArrayValue(parameters, "inpClave", value, true);
-  return openPopUp(url, "HELP_EDIT", height, width, null, null, null, null, false, true, parameters);
+  return openPopUp(url, "HELP_EDIT", height, width, null, null, null, null, false, true, parameters, null, openInMDIPopup);
 }
 
 /**
@@ -1594,8 +1616,13 @@
 * Put the focus on the Menu frame
 */
 function putFocusOnMenu() {
-  if (parent.appFrame.selectedArea == 'tabs') parent.appFrame.swichSelectedArea();
-  parent.frameMenu.focus();
+  if (parent && parent.appFrame && parent.appFrame.selectedArea == 'tabs') {
+    parent.appFrame.swichSelectedArea();
+  }
+  if (parent && parent.frameMenu) {
+    parent.frameMenu.focus();
+  }
+
   return true;
 }
 
@@ -3068,7 +3095,7 @@
 function getFrame(frameName) {
   var targetFrame;
   if (frameName == 'main') {
-    if (mainFrame_windowObj !== "") {  //to avoid make the 'main' frame search logic several times in the same html
+    if (mainFrame_windowObj !== "") {  //to avoid go inside the 'main' frame search logic several times in the same html
       targetFrame = mainFrame_windowObj;
     } else {
       var success = false;
@@ -3088,6 +3115,29 @@
       }
 
       if (success == false) {
+        try {  //some typical cases to avoid go into the logic loop. try-catch to avoid security issues when executing Openbravo inside a frame or iframe
+          if (opener && opener.parent && opener.parent.frameMenu) {
+            targetFrame = window.opener.parent;
+            success = true;
+          } else if (parent && parent.opener && parent.opener.parent && parent.opener.parent.frameMenu) {
+            targetFrame = window.parent.opener.parent;
+            success = true;
+          } else  if (opener && opener.opener && opener.opener.parent && opener.opener.parent.frameMenu) {
+            targetFrame = window.opener.opener.parent;
+            success = true;
+          } else  if (opener && opener.opener && opener.opener.opener && opener.opener.opener.parent && opener.opener.opener.parent.frameMenu) {
+            targetFrame = window.opener.opener.opener.parent;
+            success = true;
+          } else  if (opener && opener.opener && opener.opener.opener && opener.opener.opener.opener && opener.opener.opener.opener.parent && opener.opener.opener.opener.parent.frameMenu) {
+            targetFrame = window.opener.opener.opener.opener.parent;
+            success = true;
+          }
+        } catch (e) {
+          success = false;
+        }
+      }
+
+      if (success == false) {
         targetFrame = 'window';
         var targetFrame_parent = 'window.parent';
         var targetFrame_opener = 'window.opener';
@@ -3146,26 +3196,50 @@
       targetFrame = null;
     }
   } else if (frameName === 'LayoutMDI') {
-    var mainParent = getFrame('mainParent');
-    targetFrame = null;
-    if (mainParent !== null) {
-      if (LayoutMDICheck(mainParent)) {
-        targetFrame = mainParent;
+    if (LayoutMDI_windowObj !== "") {  //to avoid go inside the 'LayoutMDI' frame search logic several times in the same html
+      targetFrame = LayoutMDI_windowObj;
+    } else {
+      var mainParent = getFrame('mainParent');
+      targetFrame = null;
+      if (mainParent !== null) {
+        if (LayoutMDICheck(mainParent)) {
+          targetFrame = mainParent;
+        } else {
+          targetFrame = null;
+        }
       } else {
-        targetFrame = null;
+        if (targetFrame === null) {  // For case of classic ob popups opened from a MDI tab
+          try {
+            targetFrame = top.opener;
+            while (targetFrame !== null && !LayoutMDICheck(targetFrame)) {
+              targetFrame = targetFrame.top.opener;
+            }
+          } catch (e) {
+            targetFrame = null;
+          }
+        }
+        if (targetFrame === null) {  // For case of classic ob windows/popups opened inside a MDI modal popup
+          try {
+            targetFrame = parent;
+            while (targetFrame !== null && targetFrame !== targetFrame.parent && !LayoutMDICheck(targetFrame)) {
+              targetFrame = targetFrame.parent;
+            }
+          } catch (e) {
+            targetFrame = null;
+          }
+        }
+        if (!LayoutMDICheck(targetFrame)) {
+          targetFrame = null;
+        }
       }
-    } else {
-      try {
-        targetFrame = top.opener;
-        while (targetFrame !== null && !LayoutMDICheck(targetFrame)) {
-          targetFrame = targetFrame.top.opener;
-        }
-      } catch (e) {
-        targetFrame = null;
-      }
+      LayoutMDI_windowObj = targetFrame;
     }
   } else {
-    targetFrame = getFrame('main').frames[frameName];
+    if (getFrame('main') && getFrame('main').frames[frameName]) {
+      targetFrame = getFrame('main').frames[frameName];
+    } else {
+      targetFrame = null;
+    }
   }
   return targetFrame;
 }
@@ -4266,8 +4340,7 @@
 */
 function goToPreviousPage() {
   setMDIEnvironment();
-  var inMDIEnvironment = (isWindowInMDITab || isWindowInMDIContext); 
-  if (inMDIEnvironment) {
+  if (isWindowInMDIPage) {
     var appFrame = getFrame("appFrame");
     appFrame.history.back();
     return;
@@ -5274,6 +5347,16 @@
   return newString;
 }
 
+function closePage() {
+  if (isWindowInMDIPopup) {
+    getFrame('LayoutMDI').OB.Layout.ClassicOBCompatibility.Popup.close(MDIPopupId);
+  } else if (isWindowInMDITab) {
+  } else {
+    top.window.close();
+  }
+  return true;
+}
+
 /**
 * Start of functions to communicate with 3.0 tabbed interface
 */
@@ -5297,9 +5380,50 @@
   }
   isMDIEnvironmentSet = true;
 
-  if (isWindowInMDITab && typeof sendWindowInfoToMDI === "function") {
-    sendWindowInfoToMDI();
-  }
+  try {  // To avoid unhandled exceptions suchs a MDI modal popup
+    if (isWindowInMDITab && typeof sendWindowInfoToMDI === "function") {
+      sendWindowInfoToMDI();
+    }
+  } catch (e) {
+  }
+}
+
+/*
+ * Function that checks if the rendered html is contained inside a OB 3.0 popup or not.
+ */
+function checkWindowInMDIPopup(target) {
+  var result = true;
+
+  if (!target || target === "null" || target === "") {
+    target = window;
+  }
+
+  try {
+    while ((target.document !== target.parent.document) && (!target.document.getElementById('MDIPopupContainer'))) {
+      target = target.parent;
+    }
+  } catch (e) {
+  }
+
+  if (!target.document.getElementById('MDIPopupContainer')) {
+    result = false;
+  } else {
+    MDIPopupId = target.document.getElementById('MDIPopupContainer').name;
+  }
+
+  if (result === true && 
+      MDIPopupId !== null && 
+      document.title && 
+      getFrame('LayoutMDI') && 
+      getFrame('LayoutMDI').OB && 
+      getFrame('LayoutMDI').OB.Layout && 
+      getFrame('LayoutMDI').OB.Layout.ClassicOBCompatibility && 
+      getFrame('LayoutMDI').OB.Layout.ClassicOBCompatibility.Popup && 
+      getFrame('LayoutMDI').OB.Layout.ClassicOBCompatibility.Popup.setTitle) {
+    getFrame('LayoutMDI').OB.Layout.ClassicOBCompatibility.Popup.setTitle(MDIPopupId, document.title);
+  }
+
+  return result;
 }
 
 /*
@@ -5308,19 +5432,34 @@
 function checkWindowInMDITab(target) {
   var result = true;
 
-  if (!target || target === "null" || target === "") {
-    target = window;
-  }
-
-  try {
-    while ((target.document !== target.parent.document) && (!LayoutMDICheck(target))) {
-      target = target.parent;
+  if (isWindowInMDIPopup === true) {
+    result = false;
+  } else {
+    if (!target || target === "null" || target === "") {
+      target = window;
     }
-  } catch (e) {
-  }
-
-  if (!LayoutMDICheck(target)) {
-    result = false;
+
+    try {
+      while ((target.document !== target.parent.document) && (!LayoutMDICheck(target))) {
+        target = target.parent;
+      }
+    } catch (e) {
+    }
+
+    if (!LayoutMDICheck(target)) {
+      result = false;
+    }
+  }
+  return result;
+}
+
+/*
+ * Function that checks if the rendered html is contained inside a OB 3.0 page or not.
+ */
+function checkWindowInMDIPage(target) {
+  var result = false;
+  if (isWindowInMDIPopup === true || isWindowInMDITab === true) {
+    result = true;
   }
   return result;
 }
@@ -5335,7 +5474,7 @@
     target = window;
   }
 
-  if (isWindowInMDITab) {
+  if (isWindowInMDIPage) {
     result = true;
   } else {
     var LayoutMDI = getFrame('LayoutMDI');