details: https://code.openbravo.com/erp/devel/pi/rev/3a3b98ecb99d
changeset: 18987:3a3b98ecb99d
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Mon Dec 10 10:03:53 2012 +0100
summary: [managerial accounting] Appliying code review
diffstat:
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java
| 2 +-
src-db/database/model/tables/AD_DIMENSION_MAPPING.xml
| 1 +
src-db/database/model/tables/C_ORDERLINE_ACCTDIMENSION.xml
| 1 +
src-db/database/model/tables/GL_JOURNALLINE.xml
| 4 +-
src-db/database/model/tables/M_INOUTLINE_ACCTDIMENSION.xml
| 1 +
src-db/database/model/triggers/GL_JL_CHK_RESTRICTIONS_TRG.xml
| 2 +-
src-db/database/sourcedata/AD_MESSAGE.xml
| 2 +-
src/org/openbravo/erpCommon/ad_process/UpdateActuals.java
| 5 +-
src/org/openbravo/erpCommon/utility/DimensionDisplayUtility.java
| 2 +-
src/org/openbravo/erpCommon/utility/TreeUtility.java
| 22 ++++++++++
10 files changed, 33 insertions(+), 9 deletions(-)
diffs (170 lines):
diff -r 3bc9eeaef28e -r 3a3b98ecb99d
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java
Mon Dec 10 09:36:10 2012 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java
Mon Dec 10 10:03:53 2012 +0100
@@ -400,7 +400,7 @@
xmlDocument.setParameter("strElement_MC", strElement_MC);
xmlDocument.setParameter("strElement_U1", strElement_U1);
xmlDocument.setParameter("strElement_U2", strElement_U2);
- // xmlDocument.setParameter("strElement_CC", strElement_CC);
+ xmlDocument.setParameter("strElement_CC", strElement_CC);
response.setContentType("text/html; charset=UTF-8");
PrintWriter out = response.getWriter();
diff -r 3bc9eeaef28e -r 3a3b98ecb99d
src-db/database/model/tables/AD_DIMENSION_MAPPING.xml
--- a/src-db/database/model/tables/AD_DIMENSION_MAPPING.xml Mon Dec 10
09:36:10 2012 +0100
+++ b/src-db/database/model/tables/AD_DIMENSION_MAPPING.xml Mon Dec 10
10:03:53 2012 +0100
@@ -69,6 +69,7 @@
<foreign-key foreignTable="AD_MODULE" name="AD_DIMENSION_MAPPING_MODULE">
<reference local="AD_MODULE_ID" foreign="AD_MODULE_ID"/>
</foreign-key>
+ <check name="AD_DIM_MAP_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y',
'N')]]></check>
<unique name="AD_DIMENSION_MAPPING_UNIQUE">
<unique-column name="DIMENSION"/>
<unique-column name="DOCBASETYPE"/>
diff -r 3bc9eeaef28e -r 3a3b98ecb99d
src-db/database/model/tables/C_ORDERLINE_ACCTDIMENSION.xml
--- a/src-db/database/model/tables/C_ORDERLINE_ACCTDIMENSION.xml Mon Dec
10 09:36:10 2012 +0100
+++ b/src-db/database/model/tables/C_ORDERLINE_ACCTDIMENSION.xml Mon Dec
10 10:03:53 2012 +0100
@@ -113,6 +113,7 @@
<foreign-key foreignTable="AD_CLIENT"
name="C_ORDERLINE_ACCTDIMENSION_AD">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
+ <check name="C_ORDLINE_ACCT_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y',
'N')]]></check>
<index name="C_ORDLINE_ACCTDIM_ORDLINE" unique="false">
<index-column name="C_ORDERLINE_ID"/>
</index>
diff -r 3bc9eeaef28e -r 3a3b98ecb99d
src-db/database/model/tables/GL_JOURNALLINE.xml
--- a/src-db/database/model/tables/GL_JOURNALLINE.xml Mon Dec 10 09:36:10
2012 +0100
+++ b/src-db/database/model/tables/GL_JOURNALLINE.xml Mon Dec 10 10:03:53
2012 +0100
@@ -213,7 +213,7 @@
<foreign-key foreignTable="C_WITHHOLDING"
name="GL_JOURNALLINE_C_WITHHOLDING">
<reference local="C_WITHHOLDING_ID" foreign="C_WITHHOLDING_ID"/>
</foreign-key>
- <foreign-key foreignTable="FIN_FINANCIAL_ACCOUNT"
name="GL_JOURNALLINE_FINACC" onDelete="setnull">
+ <foreign-key foreignTable="FIN_FINANCIAL_ACCOUNT"
name="GL_JOURNALLINE_FINACC">
<reference local="FIN_FINANCIAL_ACCOUNT_ID"
foreign="FIN_FINANCIAL_ACCOUNT_ID"/>
</foreign-key>
<foreign-key foreignTable="GL_JOURNAL" name="GL_JOURNALLINE_GL_JOURNAL">
@@ -225,7 +225,7 @@
<foreign-key foreignTable="FIN_PAYMENT" name="GL_JOURNALLINE_PAYMENT"
onDelete="setnull">
<reference local="FIN_PAYMENT_ID" foreign="FIN_PAYMENT_ID"/>
</foreign-key>
- <foreign-key foreignTable="FIN_PAYMENTMETHOD"
name="GL_JOURNALLINE_PAYMETHOD" onDelete="setnull">
+ <foreign-key foreignTable="FIN_PAYMENTMETHOD"
name="GL_JOURNALLINE_PAYMETHOD">
<reference local="FIN_PAYMENTMETHOD_ID"
foreign="FIN_PAYMENTMETHOD_ID"/>
</foreign-key>
<foreign-key foreignTable="USER1" name="GL_JOURNALLINE_USER1">
diff -r 3bc9eeaef28e -r 3a3b98ecb99d
src-db/database/model/tables/M_INOUTLINE_ACCTDIMENSION.xml
--- a/src-db/database/model/tables/M_INOUTLINE_ACCTDIMENSION.xml Mon Dec
10 09:36:10 2012 +0100
+++ b/src-db/database/model/tables/M_INOUTLINE_ACCTDIMENSION.xml Mon Dec
10 10:03:53 2012 +0100
@@ -113,6 +113,7 @@
<foreign-key foreignTable="AD_CLIENT"
name="M_INOUTLINE_ACCTDIMENSION_AD">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
+ <check name="M_IOLINE_ACC_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y',
'N')]]></check>
<index name="M_IOLINE_ACCTDIM_IOLINE" unique="false">
<index-column name="M_INOUTLINE_ID"/>
</index>
diff -r 3bc9eeaef28e -r 3a3b98ecb99d
src-db/database/model/triggers/GL_JL_CHK_RESTRICTIONS_TRG.xml
--- a/src-db/database/model/triggers/GL_JL_CHK_RESTRICTIONS_TRG.xml Mon Dec
10 09:36:10 2012 +0100
+++ b/src-db/database/model/triggers/GL_JL_CHK_RESTRICTIONS_TRG.xml Mon Dec
10 10:03:53 2012 +0100
@@ -69,7 +69,7 @@
OR(COALESCE(:OLD.A_Asset_ID, '0') <> COALESCE(:NEW.A_Asset_ID, '0'))
OR(COALESCE(:OLD.C_Costcenter_ID, '0') <> COALESCE(:NEW.C_Costcenter_ID,
'0'))))
THEN
- DBMS_OUTPUT.PUT_LINE( 'Iside post loop');
+ DBMS_OUTPUT.PUT_LINE( 'Inside post loop');
RAISE_APPLICATION_ERROR(-20000, '@20501@') ;
END IF;
END IF;
diff -r 3bc9eeaef28e -r 3a3b98ecb99d src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml Mon Dec 10 09:36:10 2012 +0100
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml Mon Dec 10 10:03:53 2012 +0100
@@ -14657,7 +14657,7 @@
<!--0BA839D8B467422AB19C8E1B3B033051--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--0BA839D8B467422AB19C8E1B3B033051--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--0BA839D8B467422AB19C8E1B3B033051-->
<VALUE><![CDATA[NotCorrectOrgLines]]></VALUE>
-<!--0BA839D8B467422AB19C8E1B3B033051--> <MSGTEXT><![CDATA[The organization of
the lines is different and does not depend on the organization associated
with the header.]]></MSGTEXT>
+<!--0BA839D8B467422AB19C8E1B3B033051--> <MSGTEXT><![CDATA[The organization of
the lines is different and does not depend on the organization associated with
the header.]]></MSGTEXT>
<!--0BA839D8B467422AB19C8E1B3B033051--> <MSGTYPE><![CDATA[E]]></MSGTYPE>
<!--0BA839D8B467422AB19C8E1B3B033051-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--0BA839D8B467422AB19C8E1B3B033051--></AD_MESSAGE>
diff -r 3bc9eeaef28e -r 3a3b98ecb99d
src/org/openbravo/erpCommon/ad_process/UpdateActuals.java
--- a/src/org/openbravo/erpCommon/ad_process/UpdateActuals.java Mon Dec 10
09:36:10 2012 +0100
+++ b/src/org/openbravo/erpCommon/ad_process/UpdateActuals.java Mon Dec 10
10:03:53 2012 +0100
@@ -182,8 +182,8 @@
log4j.debug("Query String" + query.getQueryString());
- BigDecimal credit = new BigDecimal(0);
- BigDecimal debit = new BigDecimal(0);
+ BigDecimal credit = BigDecimal.ZERO;
+ BigDecimal debit = BigDecimal.ZERO;
for (Object obj : query.list()) {
if (obj != null) {
Object[] row = (Object[]) obj;
@@ -208,7 +208,6 @@
msg.setType("Error");
msg.setTitle("Error");
msg.setMessage(e.toString());
-
bundle.setResult(msg);
OBDal.getInstance().rollbackAndClose();
} finally {
diff -r 3bc9eeaef28e -r 3a3b98ecb99d
src/org/openbravo/erpCommon/utility/DimensionDisplayUtility.java
--- a/src/org/openbravo/erpCommon/utility/DimensionDisplayUtility.java Mon Dec
10 09:36:10 2012 +0100
+++ b/src/org/openbravo/erpCommon/utility/DimensionDisplayUtility.java Mon Dec
10 10:03:53 2012 +0100
@@ -42,7 +42,7 @@
public class DimensionDisplayUtility {
- public static Logger log4j = Logger.getLogger(DimensionDisplayUtility.class);
+ public static final Logger log4j =
Logger.getLogger(DimensionDisplayUtility.class);
/** Accounting Dimensions **/
public static final String DIM_Header = "H";
diff -r 3bc9eeaef28e -r 3a3b98ecb99d
src/org/openbravo/erpCommon/utility/TreeUtility.java
--- a/src/org/openbravo/erpCommon/utility/TreeUtility.java Mon Dec 10
09:36:10 2012 +0100
+++ b/src/org/openbravo/erpCommon/utility/TreeUtility.java Mon Dec 10
10:03:53 2012 +0100
@@ -38,6 +38,13 @@
private Map<String, Set<String>> childTrees = new HashMap<String,
Set<String>>();
private Map<String, Set<String>> naturalTrees = new HashMap<String,
Set<String>>();
+ /**
+ * Gets Natural tree for the given node
+ *
+ * @param nodeId
+ * @param treeType
+ * @return
+ */
public Set<String> getNaturalTree(String nodeId, String treeType) {
initialize(treeType);
Set<String> result;
@@ -51,6 +58,14 @@
return result;
}
+ /**
+ * Gets the Child tree for the given node, including optionally given node
+ *
+ * @param nodeId
+ * @param treeType
+ * @param includeNode
+ * @return
+ */
public Set<String> getChildTree(String nodeId, String treeType, boolean
includeNode) {
initialize(treeType);
Set<String> childNode = this.getChildNode(nodeId, treeType);
@@ -69,6 +84,13 @@
return result;
}
+ /**
+ * Gets Child node in the tree
+ *
+ * @param nodeId
+ * @param treeType
+ * @return
+ */
public Set<String> getChildNode(String nodeId, String treeType) {
initialize(treeType);
if (childTrees.get(nodeId) == null) {
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
