details: https://code.openbravo.com/erp/devel/pi/rev/3c7f80659da4
changeset: 18190:3c7f80659da4
user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at>
openbravo.com>
date: Wed Oct 10 10:58:48 2012 +0200
summary: Fixes Issue 21853: Products only can be assigned to a product
category without subcategories
diffstat:
src-db/database/sourcedata/AD_COLUMN.xml | 3 +-
src-db/database/sourcedata/AD_VAL_RULE.xml | 11
++++++++++
src/org/openbravo/erpCommon/ad_callouts/SL_TaxCategory_Org.java | 2 +
3 files changed, 15 insertions(+), 1 deletions(-)
diffs (54 lines):
diff -r 8da88de7089f -r 3c7f80659da4 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Wed Oct 10 11:27:02 2012 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Wed Oct 10 10:58:48 2012 +0200
@@ -26810,8 +26810,9 @@
<!--2012--> <COLUMNNAME><![CDATA[M_Product_Category_ID]]></COLUMNNAME>
<!--2012--> <AD_TABLE_ID><![CDATA[208]]></AD_TABLE_ID>
<!--2012--> <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--2012-->
<AD_VAL_RULE_ID><![CDATA[772B9BE4957746EC809B8FE4D8E3F924]]></AD_VAL_RULE_ID>
<!--2012--> <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH>
-<!--2012--> <DEFAULTVALUE><![CDATA[@SQL=SELECT MAX(M_PRODUCT_CATEGORY_ID)
FROM M_PRODUCT_CATEGORY WHERE AD_ISORGINCLUDED(@AD_ORG_ID@, AD_ORG_ID,
@#AD_CLIENT_ID@) <> -1 AND ISDEFAULT = 'Y' AND AD_CLIENT_ID =
@#AD_CLIENT_ID@]]></DEFAULTVALUE>
+<!--2012--> <DEFAULTVALUE><![CDATA[@SQL=SELECT MAX(M_PRODUCT_CATEGORY_ID)
FROM M_PRODUCT_CATEGORY WHERE AD_ISORGINCLUDED(@AD_ORG_ID@, AD_ORG_ID,
@#AD_CLIENT_ID@) <> -1 AND ISDEFAULT = 'Y' AND AD_CLIENT_ID = @#AD_CLIENT_ID@
AND ISSUMMARY='N']]></DEFAULTVALUE>
<!--2012--> <ISKEY><![CDATA[N]]></ISKEY>
<!--2012--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--2012--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
diff -r 8da88de7089f -r 3c7f80659da4 src-db/database/sourcedata/AD_VAL_RULE.xml
--- a/src-db/database/sourcedata/AD_VAL_RULE.xml Wed Oct 10 11:27:02
2012 +0200
+++ b/src-db/database/sourcedata/AD_VAL_RULE.xml Wed Oct 10 10:58:48
2012 +0200
@@ -1543,6 +1543,17 @@
<!--71188F0005494DA08311B4FFB2C5A993-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--71188F0005494DA08311B4FFB2C5A993--></AD_VAL_RULE>
+<!--772B9BE4957746EC809B8FE4D8E3F924--><AD_VAL_RULE>
+<!--772B9BE4957746EC809B8FE4D8E3F924-->
<AD_VAL_RULE_ID><![CDATA[772B9BE4957746EC809B8FE4D8E3F924]]></AD_VAL_RULE_ID>
+<!--772B9BE4957746EC809B8FE4D8E3F924-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--772B9BE4957746EC809B8FE4D8E3F924--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--772B9BE4957746EC809B8FE4D8E3F924--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--772B9BE4957746EC809B8FE4D8E3F924--> <NAME><![CDATA[M_ProductCategory(Only
Leaf)]]></NAME>
+<!--772B9BE4957746EC809B8FE4D8E3F924--> <TYPE><![CDATA[S]]></TYPE>
+<!--772B9BE4957746EC809B8FE4D8E3F924--> <CODE><![CDATA[Issummary='N']]></CODE>
+<!--772B9BE4957746EC809B8FE4D8E3F924-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--772B9BE4957746EC809B8FE4D8E3F924--></AD_VAL_RULE>
+
<!--7736D1EBBD04477FB4419BC562328CC7--><AD_VAL_RULE>
<!--7736D1EBBD04477FB4419BC562328CC7-->
<AD_VAL_RULE_ID><![CDATA[7736D1EBBD04477FB4419BC562328CC7]]></AD_VAL_RULE_ID>
<!--7736D1EBBD04477FB4419BC562328CC7-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 8da88de7089f -r 3c7f80659da4
src/org/openbravo/erpCommon/ad_callouts/SL_TaxCategory_Org.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_TaxCategory_Org.java Wed Oct
10 11:27:02 2012 +0200
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_TaxCategory_Org.java Wed Oct
10 10:58:48 2012 +0200
@@ -78,6 +78,7 @@
OBCriteria<ProductCategory> productCatCrit =
OBDao.getFilteredCriteria(ProductCategory.class, Restrictions.in(
ProductCategory.PROPERTY_ORGANIZATION + "." +
Organization.PROPERTY_ID,
new OrganizationStructureProvider().getNaturalTree(strOrgId)));
+
productCatCrit.add(Restrictions.eq(ProductCategory.PROPERTY_SUMMARYLEVEL,
false));
productCatCrit.addOrderBy(ProductCategory.PROPERTY_NAME, true);
String defaultCategoryId = getDefaultCategory(strOrgId);
for (final ProductCategory productCategory : productCatCrit.list()) {
@@ -97,6 +98,7 @@
OBCriteria<ProductCategory> productCatCrit =
OBDao.getFilteredCriteria(ProductCategory.class, Restrictions.eq(
ProductCategory.PROPERTY_ORGANIZATION + "." +
Organization.PROPERTY_ID, strOrgId), Restrictions
.eq(ProductCategory.PROPERTY_DEFAULT, true));
+
productCatCrit.add(Restrictions.eq(ProductCategory.PROPERTY_SUMMARYLEVEL,
false));
List<ProductCategory> categories = productCatCrit.list();
if (categories.size() > 0) {
return categories.get(0).getId();
------------------------------------------------------------------------------
Don't let slow site performance ruin your business. Deploy New Relic APM
Deploy New Relic app performance management and know exactly
what is happening inside your Ruby, Python, PHP, Java, and .NET app
Try New Relic at no cost today and get our sweet Data Nerd shirt too!
http://p.sf.net/sfu/newrelic-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
