details: /erp/devel/int/rev/6200778c7450
changeset: 7207:6200778c7450
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed May 05 17:41:36 2010 +0200
summary: fixed bug 13229: If you deactive on a tab all the combos that
depends on ad_org_id field the tab does not work properly
details: /erp/devel/int/rev/df3237be3b3f
changeset: 7208:df3237be3b3f
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Wed May 05 17:53:12 2010 +0200
summary: Fixes issue 0013156: C_ValidCombination_Get does not work properly
diffstat:
src-db/database/model/functions/C_VALIDCOMBINATION_GET.xml | 44 +++++++-------
src-wad/src/org/openbravo/wad/ComboReloads.javaxml | 4 +-
src-wad/src/org/openbravo/wad/Wad.java | 16 +++-
3 files changed, 36 insertions(+), 28 deletions(-)
diffs (116 lines):
diff -r 4ff77a9a0e68 -r df3237be3b3f
src-db/database/model/functions/C_VALIDCOMBINATION_GET.xml
--- a/src-db/database/model/functions/C_VALIDCOMBINATION_GET.xml Wed May
05 17:29:33 2010 +0200
+++ b/src-db/database/model/functions/C_VALIDCOMBINATION_GET.xml Wed May
05 17:53:12 2010 +0200
@@ -216,28 +216,28 @@
AND AD_Org_ID=v_AD_Org_ID
AND C_AcctSchema_ID=v_C_AcctSchema_ID
AND Account_ID=v_Account_ID -- Optional fields
- AND(v_M_Product_ID IS NULL
- OR M_Product_ID=v_M_Product_ID)
- AND(v_C_BPartner_ID IS NULL
- OR C_BPartner_ID=v_C_BPartner_ID)
- AND(v_AD_OrgTrx_ID IS NULL
- OR AD_OrgTrx_ID=v_AD_OrgTrx_ID)
- AND(v_C_LocFrom_ID IS NULL
- OR C_LocFrom_ID=v_C_LocFrom_ID)
- AND(v_C_LocTo_ID IS NULL
- OR C_LocTo_ID=v_C_LocTo_ID)
- AND(v_C_SalesRegion_ID IS NULL
- OR C_SalesRegion_ID=v_C_SalesRegion_ID)
- AND(v_C_Project_ID IS NULL
- OR C_Project_ID=v_C_Project_ID)
- AND(v_C_Campaign_ID IS NULL
- OR C_Campaign_ID=v_C_Campaign_ID)
- AND(v_C_Activity_ID IS NULL
- OR C_Activity_ID=v_C_Activity_ID)
- AND(v_User1_ID IS NULL
- OR User1_ID=v_User1_ID)
- AND(v_User2_ID IS NULL
- OR User2_ID=v_User2_ID)
+ AND((v_M_Product_ID IS NULL AND M_Product_ID IS NULL)
+ OR (v_M_Product_ID IS NOT NULL AND M_Product_ID=v_M_Product_ID))
+ AND((v_C_BPartner_ID IS NULL AND C_BPartner_ID IS NULL)
+ OR (v_C_BPartner_ID IS NOT NULL AND C_BPartner_ID=v_C_BPartner_ID))
+ AND((v_AD_OrgTrx_ID IS NULL AND AD_OrgTrx_ID IS NULL)
+ OR (v_AD_OrgTrx_ID IS NOT NULL AND AD_OrgTrx_ID=v_AD_OrgTrx_ID))
+ AND((v_C_LocFrom_ID IS NULL AND C_LocFrom_ID IS NULL)
+ OR (v_C_LocFrom_ID IS NOT NULL AND C_LocFrom_ID=v_C_LocFrom_ID))
+ AND((v_C_LocTo_ID IS NULL AND C_LocTo_ID IS NULL)
+ OR (v_C_LocTo_ID IS NOT NULL AND C_LocTo_ID=v_C_LocTo_ID))
+ AND((v_C_SalesRegion_ID IS NULL AND C_SalesRegion_ID IS NULL)
+ OR (v_C_SalesRegion_ID IS NOT NULL AND
C_SalesRegion_ID=v_C_SalesRegion_ID))
+ AND((v_C_Project_ID IS NULL AND C_Project_ID IS NULL)
+ OR (v_C_Project_ID IS NOT NULL AND C_Project_ID=v_C_Project_ID))
+ AND((v_C_Campaign_ID IS NULL AND C_Campaign_ID IS NULL)
+ OR (v_C_Campaign_ID IS NOT NULL AND C_Campaign_ID=v_C_Campaign_ID))
+ AND((v_C_Activity_ID IS NULL AND C_Activity_ID IS NULL)
+ OR (v_C_Activity_ID IS NOT NULL AND C_Activity_ID=v_C_Activity_ID))
+ AND((v_User1_ID IS NULL AND User1_ID IS NULL)
+ OR (v_User1_ID IS NOT NULL AND User1_ID=v_User1_ID))
+ AND((v_User2_ID IS NULL AND User2_ID IS NULL)
+ OR (v_User2_ID IS NOT NULL AND User2_ID=v_User2_ID))
AND IsActive='Y' -- Y comes after N
ORDER BY IsFullyQualified DESC
)
diff -r 4ff77a9a0e68 -r df3237be3b3f
src-wad/src/org/openbravo/wad/ComboReloads.javaxml
--- a/src-wad/src/org/openbravo/wad/ComboReloads.javaxml Wed May 05
17:29:33 2010 +0200
+++ b/src-wad/src/org/openbravo/wad/ComboReloads.javaxml Wed May 05
17:53:12 2010 +0200
@@ -12,7 +12,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) 2001-2009 Openbravo SLU
+ * All portions are Copyright (C) 2001-2010 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -58,6 +58,7 @@
xmlDocument.setParameter("frameName1", "mainframe");
}
+ <FIELDS_TMP id="discardTry">
try {
<FIELDS_TMP id="sectionDetail">
@@ -88,6 +89,7 @@
bdErrorHidden(response, myError.getType(), myError.getTitle(),
myError.getMessage());
return;
}
+ </FIELDS_TMP>
resultado.append("\n);");
diff -r 4ff77a9a0e68 -r df3237be3b3f src-wad/src/org/openbravo/wad/Wad.java
--- a/src-wad/src/org/openbravo/wad/Wad.java Wed May 05 17:29:33 2010 +0200
+++ b/src-wad/src/org/openbravo/wad/Wad.java Wed May 05 17:53:12 2010 +0200
@@ -2930,9 +2930,7 @@
final FieldsData[] data = FieldsData.selectValidationTab(pool, strTab);
if (data == null || data.length == 0)
return;
- final XmlDocument xmlDocument =
xmlEngine.readXmlTemplate("org/openbravo/wad/ComboReloads")
- .createXmlDocument();
- xmlDocument.setParameter("tabId", strTab);
+
final Vector<Object> vecReloads = new Vector<Object>();
final Vector<Object> vecTotal = new Vector<Object>();
final Vector<Object> vecCounters = new Vector<Object>();
@@ -3085,9 +3083,17 @@
vecTotal.copyInto(result);
}
+ // Generate always callout, even there's no columns to check
+ String discard[] = { "" };
+ if (vecTotal == null || vecTotal.size() == 0) {
+ discard[0] = "discardTry";
+ }
+
+ final XmlDocument xmlDocument =
xmlEngine.readXmlTemplate("org/openbravo/wad/ComboReloads",
+ discard).createXmlDocument();
+ xmlDocument.setParameter("tabId", strTab);
xmlDocument.setData("structure1", result);
- if (vecTotal == null || vecTotal.size() == 0)
- return;
+
WadUtility.writeFile(fileDir, "ComboReloads" + strTab + ".java",
xmlDocument.print());
}
------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
