details: /erp/devel/pi/rev/61de2f092cde
changeset: 7151:61de2f092cde
user: Anandan Narasimachari Monnin <anandan.monnin <at> openbravo.com>
date: Tue Apr 27 18:28:28 2010 +0530
summary: backout the created trigger
details: /erp/devel/pi/rev/a61461ed0794
changeset: 7152:a61461ed0794
user: Anandan Narasimachari Monnin <anandan.monnin <at> openbravo.com>
date: Tue Apr 27 18:29:25 2010 +0530
summary: backout the trigger created in the changeset 7148
diffstat:
src-db/database/model/triggers/FIN_PMT_PROPOSAL_RESTRICT_TRG.xml | 36
----------
src-db/database/model/triggers/FIN_PMT_PROP_DTL_RESTRICT_TRG.xml | 34
---------
src/org/openbravo/erpCommon/modules/ExtractModule.java | 9 +-
3 files changed, 6 insertions(+), 73 deletions(-)
diffs (113 lines):
diff -r dab53908ec46 -r a61461ed0794
src-db/database/model/triggers/FIN_PMT_PROPOSAL_RESTRICT_TRG.xml
--- a/src-db/database/model/triggers/FIN_PMT_PROPOSAL_RESTRICT_TRG.xml Tue Apr
27 13:34:03 2010 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
- <database name="TRIGGER FIN_PMT_PROPOSAL_RESTRICT_TRG">
- <trigger name="FIN_PMT_PROPOSAL_RESTRICT_TRG" table="FIN_PAYMENT_PROPOSAL"
fires="before" insert="true" update="true" delete="true" foreach="row">
- <body><![CDATA[
-
-
-BEGIN
-
- IF AD_isTriggerEnabled()='N' THEN RETURN;
- END IF;
-
- IF UPDATING THEN
- IF(:OLD.PROCESSED='Y' AND ((COALESCE(:OLD.AD_ORG_ID, '0') <>
COALESCE(:NEW.AD_ORG_ID, '0'))
- OR(COALESCE(:OLD.DOCUMENTNO, '0') <> COALESCE(:NEW.DOCUMENTNO, '0'))
- OR(COALESCE(:OLD.DESCRIPTION, '0') <> COALESCE(:NEW.DESCRIPTION, '0'))
- OR(COALESCE(:OLD.C_BPARTNER_ID, 0) <> COALESCE(:NEW.C_BPARTNER_ID, 0))
- OR(COALESCE(:OLD.FIN_PAYMENTMETHOD_ID, '0') <>
COALESCE(:NEW.FIN_PAYMENTMETHOD_ID, '0'))
- OR(COALESCE(:OLD.FIN_FINANCIAL_ACCOUNT_ID, '0') <>
COALESCE(:NEW.FIN_FINANCIAL_ACCOUNT_ID, '0'))
- OR(COALESCE(:OLD.AMOUNT, 0) <> COALESCE(:NEW.AMOUNT, 0))
- OR(:OLD.PAYMENTDATE <> :NEW.PAYMENTDATE))) THEN
- RAISE_APPLICATION_ERROR(-20501, 'Document processed/posted') ;
- END IF;
- END IF;
- IF(INSERTING) THEN
- IF(:NEW.PROCESSED='Y') THEN
- RAISE_APPLICATION_ERROR(-20501, 'Document processed/posted') ;
- END IF;
- END IF;
- IF(DELETING) THEN
- IF(:OLD.PROCESSED='Y') THEN
- RAISE_APPLICATION_ERROR(-20501, 'Document processed/posted') ;
- END IF;
- END IF;
-END FIN_PMT_PROPOSAL_RESTRICT_TRG]]></body>
- </trigger>
- </database>
diff -r dab53908ec46 -r a61461ed0794
src-db/database/model/triggers/FIN_PMT_PROP_DTL_RESTRICT_TRG.xml
--- a/src-db/database/model/triggers/FIN_PMT_PROP_DTL_RESTRICT_TRG.xml Tue Apr
27 13:34:03 2010 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
- <database name="TRIGGER FIN_PMT_PROP_DTL_RESTRICT_TRG">
- <trigger name="FIN_PMT_PROP_DTL_RESTRICT_TRG"
table="FIN_PAYMENT_PROP_DETAIL" fires="before" insert="true" update="true"
delete="true" foreach="row">
- <body><![CDATA[
-
- v_Processed VARCHAR(60) ;
- v_FIN_Payment_Proposal_ID VARCHAR2(32) ;
-
-BEGIN
-
- IF AD_isTriggerEnabled()='N' THEN RETURN;
- END IF;
-
-IF INSERTING THEN
- v_FIN_Payment_Proposal_ID:=:NEW.FIN_Payment_Proposal_ID;
- ELSE
- v_FIN_Payment_Proposal_ID:=:OLD.FIN_Payment_Proposal_ID;
- END IF;
-
-SELECT PROCESSED
- INTO v_Processed
- FROM FIN_Payment_Proposal
- WHERE FIN_Payment_Proposal_ID = v_FIN_Payment_Proposal_ID;
-IF UPDATING THEN
- IF v_Processed='Y' THEN
- RAISE_APPLICATION_ERROR(-20501, 'Document processed/posted') ;
- END IF;
-END IF;
-IF((DELETING OR INSERTING) AND v_Processed='Y') THEN
- RAISE_APPLICATION_ERROR(-20501, 'Document processed/posted') ;
-END IF;
-END FIN_PMT_PROP_DTL_RESTRICT_TRG]]></body>
- </trigger>
- </database>
diff -r dab53908ec46 -r a61461ed0794
src/org/openbravo/erpCommon/modules/ExtractModule.java
--- a/src/org/openbravo/erpCommon/modules/ExtractModule.java Tue Apr 27
13:34:03 2010 +0530
+++ b/src/org/openbravo/erpCommon/modules/ExtractModule.java Tue Apr 27
18:29:25 2010 +0530
@@ -11,7 +11,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2008 Openbravo SLU
+ * All portions are Copyright (C) 2008-2010 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -214,17 +214,20 @@
return !(s.equals(".svn") || s.equals(".hg"));
}
});
+ String fileSeparator = File.separator;
for (int i = 0; list != null && i < list.length; i++) {
if (list[i].isDirectory()) {
// add entry for directory
- obx.putNextEntry(new ZipEntry(new
ZipEntry(list[i].toString().replace(relativeDir, ""))
+ obx.putNextEntry(new ZipEntry(new
ZipEntry(list[i].toString().replace(relativeDir, "")
+ .replace(fileSeparator, "/"))
+ "/"));
obx.closeEntry();
createOBX(list[i], obx);
} else {
// add entry for file (and compress it)
final byte[] buf = new byte[1024];
- obx.putNextEntry(new ZipEntry(list[i].toString().replace(relativeDir,
"")));
+ obx.putNextEntry(new ZipEntry(list[i].toString().replace(relativeDir,
"").replace(
+ fileSeparator, "/")));
final FileInputStream in = new FileInputStream(list[i].toString());
int len;
while ((len = in.read(buf)) > 0) {
------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits