merge
authorAsier Lostalé <asier.lostale@openbravo.com>
Wed, 02 Dec 2009 07:29:19 +0100
changeset 5565 c6d1f544b5e6
parent 5564 5bd9cb26676e (current diff)
parent 5527 4b50da253e7d (diff)
child 5566 1fd4dba05201
child 6128 70bf211b935c
merge
src-db/database/lib/dbsourcemanager.jar
--- a/.hgsigs	Tue Dec 01 18:05:18 2009 +0100
+++ b/.hgsigs	Wed Dec 02 07:29:19 2009 +0100
@@ -8,3 +8,4 @@
 9d3a0d3eb72d7b3e751413809fceaa8142b0484a 0 iEYEABECAAYFAkrKN+IACgkQz3UmZbtB87CZ7QCaAllz+OE3JigDDtIXvWpizebbN4UAn2lxlkyEZc/5tqvds2M56AkGJLfM
 0cfeba053b113059f5a2609f47d5a637d9972a07 0 iEYEABECAAYFAkrcmSAACgkQCX/oGf+2qkM5bwCeM1fKbo2g5jZd0lvxFT1KEdQfMRAAoK0H+S24IXT3H+mp1ZRI5Dd5dpLs
 9f91fb70ebff156b6650de4e255fe723f2262fd7 0 iEYEABECAAYFAkroDJIACgkQCX/oGf+2qkOYgACdFu7ttmyClvcEKNJb4hTStIEggmkAoNOEc7lBPEfPizXiCfeRDGBOF7OF
+e7c306101389e980c1a1fb9d1bfeb3e200efaa94 0 iEYEABECAAYFAksNhdEACgkQCX/oGf+2qkNCCgCfVvVHzYDUBoPwv3mHqE+dLpz88UsAnRrvpWvUmXozxdaMD0X0IV123bH0
--- a/.hgtags	Tue Dec 01 18:05:18 2009 +0100
+++ b/.hgtags	Wed Dec 02 07:29:19 2009 +0100
@@ -18,3 +18,4 @@
 0915b92ee31ccfa42e9b2ca98dc07f113c7e16b0 2.50MP6
 bb34a48d4b2b3efa6e655e7b58590c52ff177db5 2.50MP7
 6a836f38131f9c289b9f3a838b728711ddd277fb 2.50MP8
+003090f7d33a5d408405addea4c74ca8e1d9f186 2.50MP9
--- a/src-db/database/model/triggers/C_ELEMENTVALUE_TRG.xml	Tue Dec 01 18:05:18 2009 +0100
+++ b/src-db/database/model/triggers/C_ELEMENTVALUE_TRG.xml	Wed Dec 02 07:29:19 2009 +0100
@@ -31,10 +31,6 @@
     
     IF AD_isTriggerEnabled()='N' THEN RETURN;
     END IF;
-    IF :old.Name <> :NEW.Name THEN RETURN;
-    END IF;
-
-
   -- Insert C_ElementValue Trigger
   --  for Translation
   --  and TreeNode
--- a/src-db/database/model/triggers/C_VALIDCOMBINATION_TRG.xml	Tue Dec 01 18:05:18 2009 +0100
+++ b/src-db/database/model/triggers/C_VALIDCOMBINATION_TRG.xml	Wed Dec 02 07:29:19 2009 +0100
@@ -83,10 +83,12 @@
     
     IF AD_isTriggerEnabled()='N' THEN RETURN;
     END IF;
-    IF (:new.Combination <> :old.Combination) THEN RETURN;
-    END IF;
-    IF (:new.Description <> :old.Description) THEN RETURN;
-    END IF;
+    IF UPDATING THEN
+        IF (:new.Combination <> :old.Combination) THEN RETURN;
+        END IF;
+        IF (:new.Description <> :old.Description) THEN RETURN;
+        END IF;
+     END IF;
 
 
  --  Load C_AcctSchema Info (if not valid: 01403 no data found)
--- a/src-db/database/sourcedata/AD_MODULE.xml	Tue Dec 01 18:05:18 2009 +0100
+++ b/src-db/database/sourcedata/AD_MODULE.xml	Wed Dec 02 07:29:19 2009 +0100
@@ -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.15307]]></VERSION>
+<!--0-->  <VERSION><![CDATA[2.50.15488]]></VERSION>
 <!--0-->  <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION>
 <!--0-->  <HELP><![CDATA[Core module is the base one, all developments in core are included as part of the standard Openbravo ERP.]]></HELP>
 <!--0-->  <URL><![CDATA[www.openbravo.com]]></URL>
--- a/src/org/openbravo/erpCommon/ad_process/PaymentMonitor.java	Tue Dec 01 18:05:18 2009 +0100
+++ b/src/org/openbravo/erpCommon/ad_process/PaymentMonitor.java	Wed Dec 02 07:29:19 2009 +0100
@@ -20,13 +20,13 @@
 import org.openbravo.model.financialmgmt.payment.DebtPayment;
 import org.openbravo.service.db.DalConnectionProvider;
 
-class PaymentMonitor {
+public class PaymentMonitor {
   private static final Logger log4j = Logger.getLogger(PaymentMonitor.class);
 
   /**
    * Updates payment monitor information
    */
-  static void updateInvoice(Invoice invoice) {
+  public static void updateInvoice(Invoice invoice) {
     List<DebtPayment> payments = invoice.getFinancialMgmtDebtPaymentList();
     BigDecimal paidAmount = BigDecimal.ZERO;
     BigDecimal overDueAmount = BigDecimal.ZERO;
--- a/src/org/openbravo/erpCommon/ad_reports/GenerateModel347_data.xsql	Tue Dec 01 18:05:18 2009 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/GenerateModel347_data.xsql	Wed Dec 02 07:29:19 2009 +0100
@@ -74,7 +74,7 @@
       LPAD(' ', 67, ' ') AS BLANCOS
       FROM C_INVOICE, AD_CLIENT, C_BPARTNER_LOCATION, C_LOCATION
       WHERE C_INVOICE.AD_CLIENT_ID = AD_CLIENT.AD_CLIENT_ID
-      AND C_INVOICE.DOCSTATUS = 'CO'
+      AND C_INVOICE.PROCESSED='Y'
       AND C_INVOICE.C_BPARTNER_LOCATION_ID = C_BPARTNER_LOCATION.C_BPARTNER_LOCATION_ID
       AND C_BPARTNER_LOCATION.C_LOCATION_ID = C_LOCATION.C_LOCATION_ID
       AND EXISTS (SELECT 1
@@ -213,7 +213,7 @@
            C_LOCATION L,
            C_REGION   R
       WHERE I.C_BPARTNER_ID = BP.C_BPARTNER_ID
-      AND I.DOCSTATUS = 'CO'
+      AND I.PROCESSED='Y'
       AND I.C_BPARTNER_LOCATION_ID = BPL.C_BPARTNER_LOCATION_ID
       AND BPL.C_LOCATION_ID = L.C_LOCATION_ID
       AND R.C_REGION_ID = L.C_REGION_ID
@@ -341,7 +341,7 @@
       LPAD(' ', 101, ' ') AS MAS_BLANCOS
       FROM C_INVOICE, AD_CLIENT, C_BPARTNER_LOCATION, C_LOCATION
       WHERE C_INVOICE.AD_CLIENT_ID = AD_CLIENT.AD_CLIENT_ID
-      AND C_INVOICE.DOCSTATUS = 'CO'
+      AND C_INVOICE.PROCESSED='Y'
       AND C_INVOICE.C_BPARTNER_LOCATION_ID = C_BPARTNER_LOCATION.C_BPARTNER_LOCATION_ID
       AND C_BPARTNER_LOCATION.C_LOCATION_ID = C_LOCATION.C_LOCATION_ID
       AND EXISTS (SELECT 1
@@ -481,7 +481,7 @@
            C_LOCATION L,
            C_REGION   R
       WHERE I.C_BPARTNER_ID = BP.C_BPARTNER_ID
-      AND I.DOCSTATUS = 'CO'
+      AND I.PROCESSED='Y'
       AND I.C_BPARTNER_LOCATION_ID = BPL.C_BPARTNER_LOCATION_ID
       AND BPL.C_LOCATION_ID = L.C_LOCATION_ID
       AND R.C_REGION_ID = L.C_REGION_ID
@@ -572,7 +572,7 @@
            C_LOCATION L,
            C_REGION   R
       WHERE I.C_INVOICE_ID = IL.C_INVOICE_ID
-      AND I.DOCSTATUS = 'CO'
+      AND I.PROCESSED='Y'
       AND IL.M_PRODUCT_ID = P.M_PRODUCT_ID
       AND P.M_PRODUCT_ID IN ('1')
       AND I.C_BPARTNER_ID = BP.C_BPARTNER_ID