details: http://code.openbravo.com/erp/devel/pi/rev/e858024ea025
changeset: 3446:e858024ea025
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Mar 25 08:26:39 2009 +0100
summary: fixed bug 0008252: error when create two fields attribute in same tab
diffstat:
src-wad/src/org/openbravo/wad/Wad.java | 4 ++++
src-wad/src/org/openbravo/wad/WadUtility.java | 10 +++++++++-
src/org/openbravo/base/model/ModelProvider.java | 4 ++++
src/org/openbravo/erpCommon/utility/TableSQLData.java | 6 +++++-
4 files changed, 22 insertions(+), 2 deletions(-)
diffs (109 lines):
diff -r 07b43c4ba4de -r e858024ea025 src-wad/src/org/openbravo/wad/Wad.java
--- a/src-wad/src/org/openbravo/wad/Wad.java Tue Mar 24 22:41:28 2009 +0100
+++ b/src-wad/src/org/openbravo/wad/Wad.java Wed Mar 25 08:26:39 2009 +0100
@@ -2841,6 +2841,8 @@
tableN = "C_ValidCombination";
else if (fieldsDef[i].referencevalue.equals("31"))
tableN = "M_Locator";
+ else if (fieldsDef[i].referencevalue.equals("35"))
+ tableN = "M_AttributeSetInstance";
else if (fieldsDef[i].referencevalue.equals("800011"))
tableN = "M_Product";
else if (fieldsDef[i].name.equalsIgnoreCase("createdBy")
@@ -2852,6 +2854,8 @@
fieldsDef[i].name = "C_ValidCombination_ID";
else if (fieldsDef[i].referencevalue.equals("31"))
fieldsDef[i].name = "M_Locator_ID";
+ else if (fieldsDef[i].referencevalue.equals("35"))
+ fieldsDef[i].name = "M_AttributeSetInstance_ID";
else if (fieldsDef[i].referencevalue.equals("800011"))
fieldsDef[i].name = "M_Product_ID";
else if (fieldsDef[i].name.equalsIgnoreCase("createdBy")
diff -r 07b43c4ba4de -r e858024ea025
src-wad/src/org/openbravo/wad/WadUtility.java
--- a/src-wad/src/org/openbravo/wad/WadUtility.java Tue Mar 24 22:41:28
2009 +0100
+++ b/src-wad/src/org/openbravo/wad/WadUtility.java Wed Mar 25 08:26:39
2009 +0100
@@ -161,6 +161,8 @@
tableDirName = "C_ValidCombination";
else if (fields.reference.equals("31"))
tableDirName = "M_Locator";
+ else if (fields.reference.equals("35"))
+ tableDirName = "M_AttributeSetInstance";
else if (fields.reference.equals("800011"))
tableDirName = "M_Product";
else
@@ -170,6 +172,8 @@
fieldId = "C_ValidCombination_ID";
else if (fields.reference.equals("31"))
fieldId = "M_Locator_ID";
+ else if (fields.reference.equals("35"))
+ fieldId = "M_AttributeSetInstance_ID";
else if (fields.reference.equals("800011"))
fieldId = "M_Product_ID";
else
@@ -323,7 +327,7 @@
} else if (fields.reference.equals("19") || fields.reference.equals("30")
|| fields.reference.equals("31") || fields.reference.equals("35")
|| fields.reference.equals("25") || fields.reference.equals("800011"))
{ // TableDir, Search
-
// y
+ // y
// Locator
itable++;
EditionFieldsData[] dataSearchs = null;
@@ -336,6 +340,8 @@
tableDirName = "C_ValidCombination";
else if (fields.reference.equals("31"))
tableDirName = "M_Locator";
+ else if (fields.reference.equals("35"))
+ tableDirName = "M_AttributeSetInstance";
else if (fields.reference.equals("800011"))
tableDirName = "M_Product";
else if (fields.name.equalsIgnoreCase("C_SETTLEMENT_CANCEL_ID"))
@@ -348,6 +354,8 @@
fieldId = "C_ValidCombination_ID";
else if (fields.reference.equals("31"))
fieldId = "M_Locator_ID";
+ else if (fields.reference.equals("35"))
+ fieldId = "M_AttributeSetInstance_ID";
else if (fields.reference.equals("800011"))
fieldId = "M_Product_ID";
else if (fields.name.equalsIgnoreCase("C_SETTLEMENT_CANCEL_ID"))
diff -r 07b43c4ba4de -r e858024ea025
src/org/openbravo/base/model/ModelProvider.java
--- a/src/org/openbravo/base/model/ModelProvider.java Tue Mar 24 22:41:28
2009 +0100
+++ b/src/org/openbravo/base/model/ModelProvider.java Wed Mar 25 08:26:39
2009 +0100
@@ -689,9 +689,13 @@
if (columnName.equalsIgnoreCase("CreatedBy") ||
columnName.equalsIgnoreCase("UpdatedBy"))
sTable = "AD_User";
+ if (reference.equals(Reference.PRODUCT_ATTRIBUTE))
+ sTable = "M_Attributesetinstance";
+
try {
c = getTable(sTable).getPrimaryKeyColumns().get(0);
} catch (final Exception e) {
+
e.printStackTrace();
}
diff -r 07b43c4ba4de -r e858024ea025
src/org/openbravo/erpCommon/utility/TableSQLData.java
--- a/src/org/openbravo/erpCommon/utility/TableSQLData.java Tue Mar 24
22:41:28 2009 +0100
+++ b/src/org/openbravo/erpCommon/utility/TableSQLData.java Wed Mar 25
08:26:39 2009 +0100
@@ -11,7 +11,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SL
- * All portions are Copyright (C) 2001-2008 Openbravo SL
+ * All portions are Copyright (C) 2001-2009 Openbravo SL
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -1540,6 +1540,10 @@
realName);
break;
case 35: // PAttribute
+ setTableDirQuery(parentTableName, "M_AttributeSetInstance_ID", field
+ .getProperty("ColumnName"),
field.getProperty("AD_Reference_Value_ID"), identifierName,
+ realName);
+ break;
case 30: // Search
setTableDirQuery(parentTableName, field.getProperty("ColumnNameSearch"),
field
.getProperty("ColumnName"),
field.getProperty("AD_Reference_Value_ID"), identifierName,
------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
