details:   /erp/devel/pi/rev/caed682227f1
changeset: 8522:caed682227f1
user:      Valery Lezhebokov <valery.lezhebokov <at> gmail.com>
date:      Sun Sep 26 14:17:20 2010 +0200
summary:   Fixes issue 12623: Module details window show license code instead 
of license name

details:   /erp/devel/pi/rev/f08d0c74961b
changeset: 8523:f08d0c74961b
user:      Valery Lezhebokov <valery.lezhebokov <at> gmail.com>
date:      Wed Oct 06 11:55:39 2010 +0200
summary:   merge

details:   /erp/devel/pi/rev/be6414a07ece
changeset: 8524:be6414a07ece
user:      Valery Lezhebokov <valery.lezhebokov <at> gmail.com>
date:      Sun Oct 03 17:02:37 2010 +0200
summary:   Fixes issue 12623: Module details window show license code instead 
of license name

details:   /erp/devel/pi/rev/c8cc677ecd99
changeset: 8525:c8cc677ecd99
user:      Valery Lezhebokov <valery.lezhebokov <at> gmail.com>
date:      Wed Oct 06 12:03:47 2010 +0200
summary:   Fixes issue 14270: When changing the Settings from General 
Availabity to Test and the other way around an error is shown

details:   /erp/devel/pi/rev/a5e39d059f84
changeset: 8526:a5e39d059f84
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Wed Oct 13 09:05:53 2010 +0200
summary:   merge

diffstat:

 .hgsigs                                                                        
      |    1 +
 .hgtags                                                                        
      |    1 +
 build.xml                                                                      
      |    2 +-
 src-core/src/org/openbravo/base/BuildTask.java                                 
      |    3 +-
 src-db/database/lib/dbsourcemanager.jar                                        
      |    0 
 src-db/database/model/functions/AD_UPDATE_ACCESS.xml                           
      |    4 +
 src-db/database/model/functions/C_BANKSTATEMENT_POST.xml                       
      |   16 +
 src-db/database/model/functions/FACT_ACCT_RESET.xml                            
      |   36 +-
 src-db/database/model/postscript-PostgreSql.sql                                
      |    2 -
 src-db/database/model/prescript-PostgreSql.sql                                 
      |   32 +-
 src-db/database/model/tables/AD_USER.xml                                       
      |    2 +-
 src-db/database/model/triggers/AD_ELEMENT_TRL_TRG.xml                          
      |    9 +-
 src-db/database/model/triggers/AD_ROLE_TRG.xml                                 
      |   36 +-
 src-db/database/sourcedata/AD_COLUMN.xml                                       
      |   10 +
 src-db/database/sourcedata/AD_FIELD.xml                                        
      |    7 +-
 src-db/database/sourcedata/AD_MESSAGE.xml                                      
      |   79 ++++
 src-db/database/sourcedata/AD_MODULE.xml                                       
      |    8 +-
 src-db/database/sourcedata/AD_PROCESS.xml                                      
      |    3 +-
 src-db/database/sourcedata/AD_TEXTINTERFACES.xml                               
      |  128 +++----
 src-db/database/sourcedata/AD_VAL_RULE.xml                                     
      |   24 +
 src-test/org/openbravo/test/AllAntTaskTests.java                               
      |    2 +
 src-test/org/openbravo/test/dal/ViewTest.java                                  
      |   52 +++
 src-wad/src/org/openbravo/wad/javasource.javaxml                               
      |   29 +-
 src/org/openbravo/base/model/Column.java                                       
      |    5 +-
 src/org/openbravo/base/model/ModelProvider.java                                
      |   19 +-
 src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql      
      |    8 +-
 src/org/openbravo/erpCommon/ad_actionButton/ExpenseSOrder.html                 
      |    6 +-
 src/org/openbravo/erpCommon/ad_actionButton/ExpenseSOrder.java                 
      |   18 +-
 src/org/openbravo/erpCommon/ad_actionButton/ExpenseSOrder.xml                  
      |    8 +-
 src/org/openbravo/erpCommon/ad_callouts/SE_PaymentMethod_FinAccount.java       
      |   18 +-
 src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Product.java                
      |    2 +-
 src/org/openbravo/erpCommon/ad_forms/AcctServer.java                           
      |    2 +-
 src/org/openbravo/erpCommon/ad_forms/DocInvoice.java                           
      |    6 +-
 src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java                     
      |   49 ++-
 src/org/openbravo/erpCommon/ad_forms/ModuleManagementInstalled.html            
      |   12 +
 src/org/openbravo/erpCommon/ad_forms/ModuleManagement_data.xsql                
      |   10 +-
 src/org/openbravo/erpCommon/ad_forms/TranslationHandler.java                   
      |    4 +-
 src/org/openbravo/erpCommon/ad_process/ApplyModules.java                       
      |    2 +-
 src/org/openbravo/erpCommon/ad_process/ChangeOrderOrg.java                     
      |   26 +-
 src/org/openbravo/erpCommon/ad_process/ExpenseAPInvoice.java                   
      |   57 ++-
 src/org/openbravo/erpCommon/ad_process/ExpenseAPInvoice_data.xsql              
      |   24 +-
 src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo          
      |   12 +-
 src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java         
      |   19 +-
 
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR.java
 |   13 +-
 src/org/openbravo/erpCommon/ad_reports/ReportOrderNotInvoiceJR.java            
      |   13 +-
 
src/org/openbravo/erpCommon/ad_reports/ReportPurchaseDimensionalAnalysesJR.java 
     |   13 +-
 
src/org/openbravo/erpCommon/ad_reports/ReportRefundSalesDimensionalAnalyses.java
     |   13 +-
 src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJR.java    
      |   13 +-
 src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJR.java 
      |   13 +-
 src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoice.java                   
      |   15 +-
 src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoiceJR.java                 
      |   14 +-
 src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java                 
      |   12 +-
 src/org/openbravo/erpCommon/info/AccountElementValue.java                      
      |    2 +-
 src/org/openbravo/erpCommon/info/AccountElementValue_data.xsql                 
      |    4 +-
 src/org/openbravo/erpCommon/modules/VersionUtility.java                        
      |   19 +-
 src/org/openbravo/erpCommon/obps/ActivationKey.java                            
      |   40 ++-
 src/org/openbravo/erpCommon/security/Login_F1.html                             
      |    2 +-
 src/org/openbravo/erpCommon/utility/DynamicJS.java                             
      |   12 +-
 src/org/openbravo/erpCommon/utility/OBError.java                               
      |   11 +
 src/org/openbravo/erpCommon/utility/ShowImage.java                             
      |   50 +--
 src/org/openbravo/erpCommon/utility/ShowImageLogo.java                         
      |   87 +----
 src/org/openbravo/erpCommon/utility/Utility.java                               
      |  167 +++++++++-
 src/org/openbravo/erpReports/C_OrderJR.jrxml                                   
      |    2 +-
 src/org/openbravo/erpReports/RptC_Invoice.jrxml                                
      |    2 +-
 src/org/openbravo/erpReports/RptC_OrderPO.jrxml                                
      |    2 +-
 src/org/openbravo/erpReports/RptM_InOut.jrxml                                  
      |    2 +-
 web/js/utils.js                                                                
      |    4 +-
 67 files changed, 968 insertions(+), 350 deletions(-)

diffs (truncated from 2851 to 300 lines):

diff -r 338a18e985ec -r a5e39d059f84 .hgsigs
--- a/.hgsigs   Sun Sep 26 13:58:02 2010 +0200
+++ b/.hgsigs   Wed Oct 13 09:05:53 2010 +0200
@@ -22,3 +22,4 @@
 7fe932c5c015da84a972d6945dd0451366bbf325 0 
iEYEABECAAYFAkwodmcACgkQCX/oGf+2qkM4jQCgq2n4X0Tzi8EcGqNLhtzjOJ/1YcgAn3Fh9aZRpXmM2zYmMwuecn4UR5tt
 618363224a381737439e0bd4461e2d36c4fd986e 0 
iEYEABECAAYFAkxFkHoACgkQCX/oGf+2qkP7DQCeK9qCv3jETpO5iM89PV2bJYmpErMAoO/H2QyeKKZjublcgFmH7g1tEomB
 6563372bc2fbf0bc2e15f70c2a8da81fad8cbc2e 0 
iEYEABECAAYFAkyDw4sACgkQCX/oGf+2qkMZ1ACePoFeipRkNAN6bW7yIUeiRYgEMBMAni+gFwpEp8kfGKryvixvdudRgGoQ
+b033dcbeeabc1db396798b8e5cbe196522f43a53 0 
iEYEABECAAYFAkydFwMACgkQCX/oGf+2qkM1NwCbBJjgs9qM221q415Ygu/EVvhE31sAn2+O6DOYQNbM3xFuCnhhtuDQWDa/
diff -r 338a18e985ec -r a5e39d059f84 .hgtags
--- a/.hgtags   Sun Sep 26 13:58:02 2010 +0200
+++ b/.hgtags   Wed Oct 13 09:05:53 2010 +0200
@@ -32,3 +32,4 @@
 34eed7b386965b19e191fbfe03195588cdc75254 2.50MP19
 99ff33f6588973f7e738b6afd47ad44f3ac08d20 2.50MP20
 a3c1cffa8af7b60cab6949251fce1faaa13ca5bb 2.50MP21
+8ede6ac265f1dd70536888ce3e20ffd54e3a3bc6 2.50MP22
diff -r 338a18e985ec -r a5e39d059f84 build.xml
--- a/build.xml Sun Sep 26 13:58:02 2010 +0200
+++ b/build.xml Wed Oct 13 09:05:53 2010 +0200
@@ -722,7 +722,7 @@
   </target>
 
 
-  <target name="apply.modules" depends="update.database.mod">
+  <target name="apply.modules">
 
     <condition property="apply.modules.complete.compilation.var">
       <istrue value="${apply.modules.complete.compilation}"  />
diff -r 338a18e985ec -r a5e39d059f84 
src-core/src/org/openbravo/base/BuildTask.java
--- a/src-core/src/org/openbravo/base/BuildTask.java    Sun Sep 26 13:58:02 
2010 +0200
+++ b/src-core/src/org/openbravo/base/BuildTask.java    Wed Oct 13 09:05:53 
2010 +0200
@@ -71,8 +71,8 @@
 
     final Vector<String> tasks = new Vector<String>();
     final String unnappliedModules = getUnnapliedModules();
+    tasks.add("update.database");
     if (isUpdatingCoreOrTemplate()) {
-      tasks.add("update.database");
       tasks.add("core.lib");
       tasks.add("wad.lib");
       tasks.add("trl.lib");
@@ -85,7 +85,6 @@
         // files and references
         ant.setProperty("apply.modules.complete.compilation", "true");
       }
-      ant.setProperty("force", "true");
       tasks.add("apply.modules");
       ant.setProperty("module", unnappliedModules);
     }
diff -r 338a18e985ec -r a5e39d059f84 src-db/database/lib/dbsourcemanager.jar
Binary file src-db/database/lib/dbsourcemanager.jar has changed
diff -r 338a18e985ec -r a5e39d059f84 
src-db/database/model/functions/AD_UPDATE_ACCESS.xml
--- a/src-db/database/model/functions/AD_UPDATE_ACCESS.xml      Sun Sep 26 
13:58:02 2010 +0200
+++ b/src-db/database/model/functions/AD_UPDATE_ACCESS.xml      Wed Oct 13 
09:05:53 2010 +0200
@@ -30,6 +30,7 @@
     '0', now(), '0', 'Y'
   FROM AD_FORM, AD_ROLE
   WHERE AD_ROLE.ISMANUAL = 'N'
+  AND AD_FORM.IsActive='Y'
     AND (
       (AD_ROLE.USERLEVEL = 'S' AND AD_FORM.ACCESSLEVEL IN ('4','7','6'))
       OR
@@ -52,6 +53,7 @@
     '0', now(), '0', 'Y'
   FROM AD_PROCESS, AD_ROLE
   WHERE AD_ROLE.ISMANUAL = 'N'
+  AND AD_PROCESS.IsActive='Y'
     AND (
       (AD_ROLE.USERLEVEL = 'S' AND AD_PROCESS.ACCESSLEVEL IN ('4','7','6'))
       OR
@@ -116,6 +118,7 @@
     '0', now(), '0', 'Y'
   FROM AD_WINDOW, AD_ROLE, AD_TAB, AD_TABLE
   WHERE AD_ROLE.ISMANUAL = 'N'
+  AND AD_WINDOW.IsActive='Y'
     AND AD_WINDOW.AD_WINDOW_ID = AD_TAB.AD_WINDOW_ID
     AND AD_TAB.AD_TABLE_ID = AD_TABLE.AD_TABLE_ID
     AND (
@@ -144,6 +147,7 @@
     '0', now(), '0', 'Y'
   FROM AD_WORKFLOW, AD_ROLE
   WHERE AD_ROLE.ISMANUAL = 'N'
+  AND AD_WORKFLOW.IsActive='Y'
     AND (
       (AD_ROLE.USERLEVEL = 'S' AND AD_WORKFLOW.ACCESSLEVEL IN ('4','7','6'))
       OR
diff -r 338a18e985ec -r a5e39d059f84 
src-db/database/model/functions/C_BANKSTATEMENT_POST.xml
--- a/src-db/database/model/functions/C_BANKSTATEMENT_POST.xml  Sun Sep 26 
13:58:02 2010 +0200
+++ b/src-db/database/model/functions/C_BANKSTATEMENT_POST.xml  Wed Oct 13 
09:05:53 2010 +0200
@@ -65,6 +65,7 @@
   TYPE RECORD IS REF CURSOR;
     Cur_Parameter RECORD;
     Cur_BankstatementDebtpayment RECORD;
+    Cur_BankstatementLine RECORD;
     -- Parameter Variables
     --  Parameter Variables
     v_Processed CHAR(1) ;
@@ -80,6 +81,8 @@
     v_BS_Date DATE;
     v_AD_Org_ID VARCHAR2(32);
     v_AD_Client_ID VARCHAR2(32) ;
+    v_ValutadatePeriod_ID NUMBER(10) ;
+    v_DateacctPeriod_ID NUMBER(10) ;
     FINISH_PROCESS BOOLEAN:=false;
   BEGIN
     --  Update AD_PInstance
@@ -371,6 +374,19 @@
        RAISE_APPLICATION_ERROR(-20000, '@Inline@'||v_line||' 
'||'@DebtAmountsSamemoneyNoMatch@') ;
       END IF;
     END IF;--FINISH_PROCESS
+    FOR Cur_BankstatementLine IN 
+      (SELECT valutadate, 
+              dateacct 
+      FROM C_BANKSTATEMENTLINE
+      WHERE C_BANKSTATEMENT_ID = v_Record_ID
+      AND ISACTIVE='Y')
+    LOOP
+      v_ValutadatePeriod_ID := C_CHK_OPEN_PERIOD (v_AD_Org_ID, 
Cur_BankstatementLine.valutadate, 'CMB',NULL);
+      v_DateacctPeriod_ID := C_CHK_OPEN_PERIOD (v_AD_Org_ID, 
Cur_BankstatementLine.dateacct, 'CMB',NULL);
+      IF (v_ValutadatePeriod_ID <> 1 OR v_DateacctPeriod_ID <> 1) THEN
+        RAISE_APPLICATION_ERROR(-20000, '@PeriodNotAvailable@') ;
+      END IF;
+    END LOOP;
     IF(NOT FINISH_PROCESS) THEN
       SELECT COUNT(*),
         MAX(bsl.Line)
diff -r 338a18e985ec -r a5e39d059f84 
src-db/database/model/functions/FACT_ACCT_RESET.xml
--- a/src-db/database/model/functions/FACT_ACCT_RESET.xml       Sun Sep 26 
13:58:02 2010 +0200
+++ b/src-db/database/model/functions/FACT_ACCT_RESET.xml       Wed Oct 13 
09:05:53 2010 +0200
@@ -19,7 +19,7 @@
   * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
   * All Rights Reserved.
   * Contributor(s): Openbravo SLU
-  * Contributions are Copyright (C) 2001-2009 Openbravo, S.L.U.
+  * Contributions are Copyright (C) 2001-2010 Openbravo, S.L.U.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -62,6 +62,8 @@
     v_DocAction VARCHAR2(60);
     v_UpdatedBy AD_PINSTANCE.UpdatedBy%TYPE;
     v_DeleteFact varchar2(1):='Y';
+    
+    v_isacctle AD_OrgType.IsAcctLegalEntity%TYPE:='N';    
  BEGIN
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Processing ' || p_PInstance_ID) 
;
@@ -119,14 +121,41 @@
           WHERE ' || v_TableName || '_ID =''' || v_Record_ID || ''' AND 
AD_CLIENT_ID =''' || v_AD_Client_ID || ''' '
           INTO v_AD_Org_ID;
         END IF;
+        
+        -- Check the period control is opened (only if it is legal entity with 
accounting)
+        SELECT COALESCE(t.ISACCTLEGALENTITY, 'N')
+        INTO v_isacctle
+        FROM AD_Org o JOIN AD_OrgType t ON (o.ad_orgtype_id=t.ad_orgtype_id) 
+        WHERE AD_IsOrgIncluded(v_AD_Org_ID, o.ad_org_id , v_AD_Client_ID) <> -1
+        AND t.ISACCTLEGALENTITY='Y';
+        IF (v_isacctle='Y') THEN
+          DECLARE
+          v_available_period NUMBER:=0;
+          TYPE RECORD IS REF CURSOR;
+            Cur_Fact_Records RECORD;
+          BEGIN
+            FOR Cur_Fact_Records IN
+              (SELECT DATEACCT, DOCBASETYPE, C_DOCTYPE_ID
+               FROM FACT_ACCT
+               WHERE AD_TABLE_ID=v_AD_Table_ID
+               AND Record_ID = v_Record_ID
+              )
+            LOOP
+              v_available_period:=C_CHK_OPEN_PERIOD(v_AD_Org_ID, 
Cur_Fact_Records.DATEACCT, Cur_Fact_Records.DOCBASETYPE, 
Cur_Fact_Records.C_DOCTYPE_ID);
+              IF (v_available_period<>1) THEN
+                RAISE_APPLICATION_ERROR(-20000, '@PeriodClosedForUnPosting@');
+              END IF;
+            END LOOP;
+           END; 
+        END IF;
     END IF;
 
     DBMS_OUTPUT.PUT_LINE('  Record_ID=' || v_Record_ID) ;
-   -- Fact_Acct_Rest - Finish_Process Extension Point
+   -- Fact_Acct_Rest - Start_Process Extension Point
    SELECT count(*) INTO v_count
    FROM DUAL
    where exists (select 1 from ad_ep_procedures where ad_extension_points_id = 
'E1F9635815BF4A44B88E3EAADBD0D10E');
-         IF (v_count=1) THEN
+   IF (v_count=1) THEN
      DECLARE
        v_ep_instance VARCHAR(32);
        v_extension_point_id VARCHAR(32) := 'E1F9635815BF4A44B88E3EAADBD0D10E';
@@ -166,6 +195,7 @@
        WHERE ad_ep_instance_id = v_ep_instance;
       END;
    END IF;
+   -- Fact_Acct_Rest - Finish_Process Extension Point
     DECLARE
     TYPE RECORD IS REF CURSOR;
       Cur_Clients RECORD;
diff -r 338a18e985ec -r a5e39d059f84 
src-db/database/model/postscript-PostgreSql.sql
--- a/src-db/database/model/postscript-PostgreSql.sql   Sun Sep 26 13:58:02 
2010 +0200
+++ b/src-db/database/model/postscript-PostgreSql.sql   Wed Oct 13 09:05:53 
2010 +0200
@@ -23,7 +23,6 @@
 BEGIN
  FOR Cur_Triggers IN (SELECT OBJECT_NAME AS NAME, TABLE_NAME
                       FROM USER_OBJECTS
-                      WHERE OBJECT_TYPE = 'TRIGGER'
                       ORDER BY OBJECT_NAME) LOOP
     v_seqNo := v_seqNo + 1;
   --      INSERT INTO AD_SCRIPT_SQL VALUES (v_seqNo, 'ALTER TRIGGER 
'||Cur_Triggers.NAME||' DISABLE');
@@ -96,7 +95,6 @@
 BEGIN
  FOR Cur_Triggers IN (SELECT OBJECT_NAME AS NAME, TABLE_NAME
                       FROM USER_OBJECTS
-                      WHERE OBJECT_TYPE = 'TRIGGER'
                       ORDER BY OBJECT_NAME) LOOP
       v_seqNo := v_seqNo + 1;
 --    INSERT INTO AD_SCRIPT_SQL VALUES (v_seqNo, 'ALTER TRIGGER 
'||Cur_Triggers.NAME||' ENABLE');
diff -r 338a18e985ec -r a5e39d059f84 
src-db/database/model/prescript-PostgreSql.sql
--- a/src-db/database/model/prescript-PostgreSql.sql    Sun Sep 26 13:58:02 
2010 +0200
+++ b/src-db/database/model/prescript-PostgreSql.sql    Wed Oct 13 09:05:53 
2010 +0200
@@ -1158,18 +1158,42 @@
 SELECT * FROM drop_view('USER_OBJECTS')
 /-- END
 
-CREATE OR REPLACE VIEW USER_OBJECTS
-(TABLE_NAME, OBJECT_NAME, OBJECT_ID, OBJECT_TYPE, STATUS)
+CREATE or REPLACE function create_user_objects() returns varchar as '
+DECLARE
+  cnt int4;
+BEGIN
+  SELECT into cnt count(*) from version() where version like ''%PostgreSQL 
9.%'';
+  if cnt > 0 then
+    execute ''CREATE OR REPLACE VIEW USER_OBJECTS
+(TABLE_NAME, OBJECT_NAME, OBJECT_ID)
 AS 
-SELECT UPPER(PG_CLASS.RELNAME), UPPER(PG_TRIGGER.TGNAME), PG_TRIGGER.TGFOID, 
TO_CHAR('TRIGGER'), CASE is_Trigger_Enabled(PG_TRIGGER.TGNAME) WHEN TRUE THEN 
TO_CHAR('VALID') ELSE TO_CHAR('INVALID') END
+SELECT UPPER(PG_CLASS.RELNAME), UPPER(PG_TRIGGER.TGNAME), PG_TRIGGER.TGFOID
+FROM PG_TRIGGER, PG_NAMESPACE, PG_CLASS 
+WHERE PG_TRIGGER.TGRELID = PG_CLASS.OID
+AND PG_TRIGGER.TGISINTERNAL = FALSE
+AND PG_CLASS.RELNAMESPACE = PG_NAMESPACE.OID
+AND PG_NAMESPACE.NSPNAME = CURRENT_SCHEMA()'';
+else
+execute ''CREATE OR REPLACE VIEW USER_OBJECTS
+(TABLE_NAME, OBJECT_NAME, OBJECT_ID)
+AS 
+SELECT UPPER(PG_CLASS.RELNAME), UPPER(PG_TRIGGER.TGNAME), PG_TRIGGER.TGFOID
 FROM PG_TRIGGER, PG_NAMESPACE, PG_CLASS 
 WHERE PG_TRIGGER.TGRELID = PG_CLASS.OID
 AND PG_TRIGGER.TGISCONSTRAINT = FALSE
 AND PG_CLASS.RELNAMESPACE = PG_NAMESPACE.OID
-AND PG_NAMESPACE.NSPNAME = CURRENT_SCHEMA()
+AND PG_NAMESPACE.NSPNAME = CURRENT_SCHEMA()'';
+  end if;
+  return null;
+END;'
+language 'plpgsql'
 /-- END
 
+SELECT * FROM create_user_objects()
+/-- END
 
+DROP FUNCTION create_user_objects()
+/-- END
 
 SELECT * FROM drop_view('USER_CONS_COLUMNS')
 /-- END
diff -r 338a18e985ec -r a5e39d059f84 src-db/database/model/tables/AD_USER.xml
--- a/src-db/database/model/tables/AD_USER.xml  Sun Sep 26 13:58:02 2010 +0200
+++ b/src-db/database/model/tables/AD_USER.xml  Wed Oct 13 09:05:53 2010 +0200
@@ -152,7 +152,7 @@
       <foreign-key foreignTable="AD_ORG" name="AD_USER_AD_ORGTRX">
         <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_BPARTNER" name="AD_USER_C_BPARTNER">
+      <foreign-key foreignTable="C_BPARTNER" name="AD_USER_C_BPARTNER" 
onDelete="cascade">
         <reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_BPARTNER_LOCATION" 
name="AD_USER_C_BPARTNER_LOCATION">
diff -r 338a18e985ec -r a5e39d059f84 
src-db/database/model/triggers/AD_ELEMENT_TRL_TRG.xml
--- a/src-db/database/model/triggers/AD_ELEMENT_TRL_TRG.xml     Sun Sep 26 
13:58:02 2010 +0200
+++ b/src-db/database/model/triggers/AD_ELEMENT_TRL_TRG.xml     Wed Oct 13 
09:05:53 2010 +0200
@@ -38,12 +38,13 @@
   IF UPDATING
   THEN
     IF (   COALESCE (:OLD.NAME, '.') <> COALESCE (:NEW.NAME, '.')
-        OR COALESCE (:OLD.Description, '.') <>
-                                              COALESCE (:NEW.Description, '.')
+        OR COALESCE (:OLD.Description, '.') <> COALESCE (:NEW.Description, '.')
         OR COALESCE (:OLD.HELP, '.') <> COALESCE (:NEW.HELP, '.')
         OR COALESCE (:OLD.PrintName, '.') <> COALESCE (:NEW.PrintName, '.')
-        OR COALESCE (:OLD.IsTranslated, '.') <>
-                                             COALESCE (:NEW.IsTranslated, '.')
+        OR COALESCE (:OLD.IsTranslated, '.') <> COALESCE (:NEW.IsTranslated, 
'.')
+        OR COALESCE (:OLD.PO_NAME, '.') <> COALESCE (:NEW.PO_NAME, '.')
+        OR COALESCE (:OLD.PO_Description, '.') <> COALESCE 
(:NEW.PO_Description, '.')
+        OR COALESCE (:OLD.PO_HELP, '.') <> COALESCE (:NEW.PO_HELP, '.')
        )
     THEN

------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1,  ECMAScript5, and DOM L2 & L3.
Spend less time writing and  rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to