details: /erp/stable/2.50/rev/edf90f26beed
changeset: 9290:edf90f26beed
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Thu Mar 17 09:37:28 2011 +0100
summary: Backed out changeset 03df43a71e8c
Issue 15594
details: /erp/stable/2.50/rev/488d675556b5
changeset: 9291:488d675556b5
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Thu Mar 17 09:37:44 2011 +0100
summary: Merging backout
diffstat:
src-db/database/lib/dbsourcemanager.jar | 0
src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml | 7 ------
src-db/database/sourcedata/AD_COLUMN.xml | 2 +-
src-db/database/sourcedata/AD_FIELD.xml | 4 +-
src-db/database/sourcedata/AD_MESSAGE.xml | 11
----------
src/org/openbravo/erpCommon/ad_forms/Fact.java | 3 ++
6 files changed, 6 insertions(+), 21 deletions(-)
diffs (86 lines):
diff -r 03df43a71e8c -r 488d675556b5 src-db/database/lib/dbsourcemanager.jar
Binary file src-db/database/lib/dbsourcemanager.jar has changed
diff -r 03df43a71e8c -r 488d675556b5
src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml
--- a/src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml Wed Mar
16 12:32:39 2011 +0100
+++ b/src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml Thu Mar
17 09:37:44 2011 +0100
@@ -77,13 +77,6 @@
END IF;
END IF;
END IF;
-
- IF(UPDATING OR INSERTING) THEN
- IF (:NEW.C_BPARTNER_ID IS NOT NULL AND :NEW.C_BPARTNER_LOCATION_ID IS
NULL) THEN
- RAISE_APPLICATION_ERROR(-20000, '@LocationNotNullConstraint@');
- END IF;
- END IF;
-
IF(DELETING OR INSERTING) THEN
SELECT PROCESSED,
DOCACTION
diff -r 03df43a71e8c -r 488d675556b5 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Wed Mar 16 12:32:39 2011 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Thu Mar 17 09:37:44 2011 +0100
@@ -55165,7 +55165,7 @@
<!--3404--> <DEFAULTVALUE><![CDATA[@C_BPartner_Location_ID@]]></DEFAULTVALUE>
<!--3404--> <ISKEY><![CDATA[N]]></ISKEY>
<!--3404--> <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--3404--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--3404--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
<!--3404--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
<!--3404--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
<!--3404--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
diff -r 03df43a71e8c -r 488d675556b5 src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Wed Mar 16 12:32:39 2011 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml Thu Mar 17 09:37:44 2011 +0100
@@ -19797,7 +19797,7 @@
<!--1574--> <AD_TAB_ID><![CDATA[187]]></AD_TAB_ID>
<!--1574--> <AD_COLUMN_ID><![CDATA[2764]]></AD_COLUMN_ID>
<!--1574--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--1574--> <DISPLAYLOGIC><![CDATA[(@OrderType@='OB' | @OrderType@='SO' |
@OrderType@='WP' | @Processed@='Y') & @C_Order_Discount_ID@='']]></DISPLAYLOGIC>
+<!--1574--> <DISPLAYLOGIC><![CDATA[@OrderType@='OB' | @OrderType@='SO' |
@OrderType@='WP' | @Processed@='Y']]></DISPLAYLOGIC>
<!--1574--> <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
<!--1574--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
<!--1574--> <SEQNO><![CDATA[40]]></SEQNO>
@@ -28919,7 +28919,7 @@
<!--2595--> <AD_TAB_ID><![CDATA[187]]></AD_TAB_ID>
<!--2595--> <AD_COLUMN_ID><![CDATA[3404]]></AD_COLUMN_ID>
<!--2595--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--2595--> <DISPLAYLOGIC><![CDATA[(@OrderType@='OB' | @OrderType@='SO' |
@OrderType@='WP' | @Processed@='Y') & @C_Order_Discount_ID@='']]></DISPLAYLOGIC>
+<!--2595--> <DISPLAYLOGIC><![CDATA[@OrderType@='OB' | @OrderType@='SO' |
@OrderType@='WP' | @Processed@='Y']]></DISPLAYLOGIC>
<!--2595--> <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
<!--2595--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
<!--2595--> <SEQNO><![CDATA[50]]></SEQNO>
diff -r 03df43a71e8c -r 488d675556b5 src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml Wed Mar 16 12:32:39 2011 +0100
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml Thu Mar 17 09:37:44 2011 +0100
@@ -34036,17 +34036,6 @@
<!--EF6ECE31E8474A289803BC07D3774F17-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--EF6ECE31E8474A289803BC07D3774F17--></AD_MESSAGE>
-<!--EF95449A17A04724B44873FD5EEFD249--><AD_MESSAGE>
-<!--EF95449A17A04724B44873FD5EEFD249-->
<AD_MESSAGE_ID><![CDATA[EF95449A17A04724B44873FD5EEFD249]]></AD_MESSAGE_ID>
-<!--EF95449A17A04724B44873FD5EEFD249-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--EF95449A17A04724B44873FD5EEFD249--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--EF95449A17A04724B44873FD5EEFD249--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--EF95449A17A04724B44873FD5EEFD249-->
<VALUE><![CDATA[LocationNotNullConstraint]]></VALUE>
-<!--EF95449A17A04724B44873FD5EEFD249--> <MSGTEXT><![CDATA[The field Partner
Address is mandatory and cannot be left empty.]]></MSGTEXT>
-<!--EF95449A17A04724B44873FD5EEFD249--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
-<!--EF95449A17A04724B44873FD5EEFD249-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--EF95449A17A04724B44873FD5EEFD249--></AD_MESSAGE>
-
<!--F17014A0E42A487A9D9AEDBA41A87620--><AD_MESSAGE>
<!--F17014A0E42A487A9D9AEDBA41A87620-->
<AD_MESSAGE_ID><![CDATA[F17014A0E42A487A9D9AEDBA41A87620]]></AD_MESSAGE_ID>
<!--F17014A0E42A487A9D9AEDBA41A87620-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 03df43a71e8c -r 488d675556b5
src/org/openbravo/erpCommon/ad_forms/Fact.java
--- a/src/org/openbravo/erpCommon/ad_forms/Fact.java Wed Mar 16 12:32:39
2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/Fact.java Thu Mar 17 09:37:44
2011 +0100
@@ -112,6 +112,9 @@
strNegate = "Y";
BigDecimal DebitAmt = new BigDecimal(debitAmt.equals("") ? "0.00" :
debitAmt);
BigDecimal CreditAmt = new BigDecimal(creditAmt.equals("") ? "0.00" :
creditAmt);
+ if (DebitAmt.compareTo(BigDecimal.ZERO) == 0 &&
CreditAmt.compareTo(BigDecimal.ZERO) == 0) {
+ return null;
+ }
if (strNegate.equals("N") && (DebitAmt.compareTo(ZERO) < 0 ||
CreditAmt.compareTo(ZERO) < 0)) {
return createLine(docLine, account, C_Currency_ID,
CreditAmt.abs().toString(), DebitAmt.abs()
.toString(), Fact_Acct_Group_ID, SeqNo, DocBaseType, conn);
------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
