details: /erp/devel/pi/rev/819d563dac0b
changeset: 10627:819d563dac0b
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Mon Feb 14 18:22:02 2011 +0100
summary: [OBUISEL] Fixed issue in SelectorFieldPropertyCallout getting the
ad_column_id.
details: /erp/devel/pi/rev/936918fc9fc7
changeset: 10628:936918fc9fc7
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Mon Feb 14 18:22:43 2011 +0100
summary: [OBUISEL] Changes after updating the ad_column_id and run
synchronize terminology.
diffstat:
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorFieldPropertyCallout.java
| 9 +-
src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
| 38 +++++++--
2 files changed, 32 insertions(+), 15 deletions(-)
diffs (148 lines):
diff -r 32ca9fe515dc -r 936918fc9fc7
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorFieldPropertyCallout.java
---
a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorFieldPropertyCallout.java
Mon Feb 14 18:04:41 2011 +0100
+++
b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorFieldPropertyCallout.java
Mon Feb 14 18:22:43 2011 +0100
@@ -98,7 +98,7 @@
writeEmptyResult(response);
return;
}
- if (part.equals(JsonConstants.IDENTIFIER)) {
+ if (part.equals(JsonConstants.IDENTIFIER) ||
part.equals(JsonConstants.ID)) {
if (foundProperty == null) {
writeEmptyResult(response);
return;
@@ -106,15 +106,10 @@
break;
}
currentProperty = currentEntity.getProperty(part);
+ foundProperty = currentProperty;
if (currentProperty.isPrimitive()) {
- // the last leg
- if (parts.length == 1) {
- // if there is only one step then just the current property
directly
- foundProperty = currentProperty;
- }
break;
}
- foundProperty = currentProperty;
currentEntity = foundProperty.getTargetEntity();
}
}
diff -r 32ca9fe515dc -r 936918fc9fc7
src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
--- a/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml Mon Feb 14
18:04:41 2011 +0100
+++ b/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml Mon Feb 14
18:22:43 2011 +0100
@@ -6,8 +6,12 @@
<!--01C1FF0DFB3643EEA2AF93128A057BEF-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--01C1FF0DFB3643EEA2AF93128A057BEF--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--01C1FF0DFB3643EEA2AF93128A057BEF-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--01C1FF0DFB3643EEA2AF93128A057BEF-->
<AD_COLUMN_ID><![CDATA[9BAEEE4845EA38D8E040007F01002420]]></AD_COLUMN_ID>
-<!--01C1FF0DFB3643EEA2AF93128A057BEF--> <NAME><![CDATA[Key]]></NAME>
+<!--01C1FF0DFB3643EEA2AF93128A057BEF-->
<AD_COLUMN_ID><![CDATA[2011]]></AD_COLUMN_ID>
+<!--01C1FF0DFB3643EEA2AF93128A057BEF--> <NAME><![CDATA[Search Key]]></NAME>
+<!--01C1FF0DFB3643EEA2AF93128A057BEF--> <DESCRIPTION><![CDATA[A fast method
for finding a particular record.]]></DESCRIPTION>
+<!--01C1FF0DFB3643EEA2AF93128A057BEF--> <HELP><![CDATA[A search key allows
for a fast method of finding a particular record. If you leave the search key
empty, the system automatically creates a numeric number originating from a
document sequence defined in the "Document Sequence" window. The sequence
naming convention follows a rule "DocumentNo_TableName", where TableName is the
actual name of the database table (e.g. C_Order).
+
+Usually, company's internal identifiers for various records (products,
customers, etc) are stored here.]]></HELP>
<!--01C1FF0DFB3643EEA2AF93128A057BEF-->
<PROPERTY><![CDATA[product.searchKey]]></PROPERTY>
<!--01C1FF0DFB3643EEA2AF93128A057BEF-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--01C1FF0DFB3643EEA2AF93128A057BEF--> <SORT><![CDATA[Y]]></SORT>
@@ -47,6 +51,8 @@
<!--2CB91FE062B541ACB00D82AC69858446-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--2CB91FE062B541ACB00D82AC69858446-->
<AD_COLUMN_ID><![CDATA[9BAEEE4845EA38D8E040007F01002420]]></AD_COLUMN_ID>
<!--2CB91FE062B541ACB00D82AC69858446--> <NAME><![CDATA[Product]]></NAME>
+<!--2CB91FE062B541ACB00D82AC69858446--> <DESCRIPTION><![CDATA[An item
produced by a process.]]></DESCRIPTION>
+<!--2CB91FE062B541ACB00D82AC69858446--> <HELP><![CDATA[Identifies an item
which is either purchased or sold in this organization.]]></HELP>
<!--2CB91FE062B541ACB00D82AC69858446-->
<PROPERTY><![CDATA[product.id]]></PROPERTY>
<!--2CB91FE062B541ACB00D82AC69858446-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--2CB91FE062B541ACB00D82AC69858446--> <SORT><![CDATA[Y]]></SORT>
@@ -65,7 +71,9 @@
<!--3203B0B55E504F2BB6EF533075441F1A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--3203B0B55E504F2BB6EF533075441F1A-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--3203B0B55E504F2BB6EF533075441F1A-->
<AD_COLUMN_ID><![CDATA[2760]]></AD_COLUMN_ID>
-<!--3203B0B55E504F2BB6EF533075441F1A--> <NAME><![CDATA[Pricelist
Version]]></NAME>
+<!--3203B0B55E504F2BB6EF533075441F1A--> <NAME><![CDATA[Price List
Version]]></NAME>
+<!--3203B0B55E504F2BB6EF533075441F1A--> <DESCRIPTION><![CDATA[A price list
with a specified validity range.]]></DESCRIPTION>
+<!--3203B0B55E504F2BB6EF533075441F1A--> <HELP><![CDATA[Each Price List can
have multiple versions. The most common use is to indicate the dates that a
Price List is valid for.]]></HELP>
<!--3203B0B55E504F2BB6EF533075441F1A-->
<PROPERTY><![CDATA[productPrice.priceListVersion]]></PROPERTY>
<!--3203B0B55E504F2BB6EF533075441F1A-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--3203B0B55E504F2BB6EF533075441F1A--> <SORT><![CDATA[Y]]></SORT>
@@ -85,7 +93,9 @@
<!--3425E56A245B47519498AFD14B8C1408--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--3425E56A245B47519498AFD14B8C1408-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--3425E56A245B47519498AFD14B8C1408-->
<AD_COLUMN_ID><![CDATA[9BAEEE4845ED38D8E040007F01002420]]></AD_COLUMN_ID>
-<!--3425E56A245B47519498AFD14B8C1408--> <NAME><![CDATA[Available
Qty.]]></NAME>
+<!--3425E56A245B47519498AFD14B8C1408--> <NAME><![CDATA[Available]]></NAME>
+<!--3425E56A245B47519498AFD14B8C1408--> <DESCRIPTION><![CDATA[Quantity of
products available]]></DESCRIPTION>
+<!--3425E56A245B47519498AFD14B8C1408--> <HELP><![CDATA[Available quantity of
products]]></HELP>
<!--3425E56A245B47519498AFD14B8C1408-->
<PROPERTY><![CDATA[available]]></PROPERTY>
<!--3425E56A245B47519498AFD14B8C1408-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--3425E56A245B47519498AFD14B8C1408--> <SORT><![CDATA[Y]]></SORT>
@@ -165,6 +175,8 @@
<!--7A814E72DF9240E280BA6B2AEFF9405A-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--7A814E72DF9240E280BA6B2AEFF9405A-->
<AD_COLUMN_ID><![CDATA[9BAEEE4845EB38D8E040007F01002420]]></AD_COLUMN_ID>
<!--7A814E72DF9240E280BA6B2AEFF9405A--> <NAME><![CDATA[Warehouse]]></NAME>
+<!--7A814E72DF9240E280BA6B2AEFF9405A--> <DESCRIPTION><![CDATA[The location
where products arrive to or are sent from.]]></DESCRIPTION>
+<!--7A814E72DF9240E280BA6B2AEFF9405A--> <HELP><![CDATA[The Warehouse
identifies a unique Warehouse where products are stored or Services are
provided.]]></HELP>
<!--7A814E72DF9240E280BA6B2AEFF9405A-->
<PROPERTY><![CDATA[warehouse]]></PROPERTY>
<!--7A814E72DF9240E280BA6B2AEFF9405A-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--7A814E72DF9240E280BA6B2AEFF9405A--> <SORT><![CDATA[Y]]></SORT>
@@ -189,6 +201,8 @@
<!--7F415E2D50A041CB83BF79EA460DB884-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--7F415E2D50A041CB83BF79EA460DB884-->
<AD_COLUMN_ID><![CDATA[2110]]></AD_COLUMN_ID>
<!--7F415E2D50A041CB83BF79EA460DB884--> <NAME><![CDATA[Currency]]></NAME>
+<!--7F415E2D50A041CB83BF79EA460DB884--> <DESCRIPTION><![CDATA[An accepted
medium of monetary exchange that may vary across countries.]]></DESCRIPTION>
+<!--7F415E2D50A041CB83BF79EA460DB884--> <HELP><![CDATA[Indicates the currency
to be used when processing this document.]]></HELP>
<!--7F415E2D50A041CB83BF79EA460DB884-->
<PROPERTY><![CDATA[productPrice.priceListVersion.priceList.currency.id]]></PROPERTY>
<!--7F415E2D50A041CB83BF79EA460DB884-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--7F415E2D50A041CB83BF79EA460DB884--> <SORT><![CDATA[Y]]></SORT>
@@ -248,7 +262,9 @@
<!--94298E76C86A439A935D7D84E7DF1C3E--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--94298E76C86A439A935D7D84E7DF1C3E-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--94298E76C86A439A935D7D84E7DF1C3E-->
<AD_COLUMN_ID><![CDATA[9BAEEE4845F338D8E040007F01002420]]></AD_COLUMN_ID>
-<!--94298E76C86A439A935D7D84E7DF1C3E--> <NAME><![CDATA[Limit]]></NAME>
+<!--94298E76C86A439A935D7D84E7DF1C3E--> <NAME><![CDATA[Price Limit]]></NAME>
+<!--94298E76C86A439A935D7D84E7DF1C3E--> <DESCRIPTION><![CDATA[The lowest
price a specified item may be sold for.]]></DESCRIPTION>
+<!--94298E76C86A439A935D7D84E7DF1C3E--> <HELP><![CDATA[The Price Limit
indicates the lowest price for a product stated in the Price List
Currency.]]></HELP>
<!--94298E76C86A439A935D7D84E7DF1C3E-->
<PROPERTY><![CDATA[priceLimit]]></PROPERTY>
<!--94298E76C86A439A935D7D84E7DF1C3E-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--94298E76C86A439A935D7D84E7DF1C3E--> <SORT><![CDATA[Y]]></SORT>
@@ -267,8 +283,10 @@
<!--970BAD3358774ED191B4DB1B08F5EA8F-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--970BAD3358774ED191B4DB1B08F5EA8F--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--970BAD3358774ED191B4DB1B08F5EA8F-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--970BAD3358774ED191B4DB1B08F5EA8F-->
<AD_COLUMN_ID><![CDATA[9BAEEE4845EA38D8E040007F01002420]]></AD_COLUMN_ID>
+<!--970BAD3358774ED191B4DB1B08F5EA8F-->
<AD_COLUMN_ID><![CDATA[1410]]></AD_COLUMN_ID>
<!--970BAD3358774ED191B4DB1B08F5EA8F--> <NAME><![CDATA[Name]]></NAME>
+<!--970BAD3358774ED191B4DB1B08F5EA8F--> <DESCRIPTION><![CDATA[A non-unique
identifier for a record/document often used as a search tool.]]></DESCRIPTION>
+<!--970BAD3358774ED191B4DB1B08F5EA8F--> <HELP><![CDATA[A more descriptive
identifier (that does need to be unique) of a record/document that is used as a
default search option along with the search key (that is unique and mostly
shorter). It is up to 60 characters in length.]]></HELP>
<!--970BAD3358774ED191B4DB1B08F5EA8F-->
<PROPERTY><![CDATA[product.name]]></PROPERTY>
<!--970BAD3358774ED191B4DB1B08F5EA8F-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--970BAD3358774ED191B4DB1B08F5EA8F--> <SORT><![CDATA[Y]]></SORT>
@@ -366,6 +384,8 @@
<!--BDD3B034C9D24559BA187C976DFF4498-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--BDD3B034C9D24559BA187C976DFF4498-->
<AD_COLUMN_ID><![CDATA[1760]]></AD_COLUMN_ID>
<!--BDD3B034C9D24559BA187C976DFF4498--> <NAME><![CDATA[UOM]]></NAME>
+<!--BDD3B034C9D24559BA187C976DFF4498--> <DESCRIPTION><![CDATA[A non monetary
unit of measure.]]></DESCRIPTION>
+<!--BDD3B034C9D24559BA187C976DFF4498--> <HELP><![CDATA[The UOM defines a
unique non monetary unit of measure]]></HELP>
<!--BDD3B034C9D24559BA187C976DFF4498-->
<PROPERTY><![CDATA[product.uOM]]></PROPERTY>
<!--BDD3B034C9D24559BA187C976DFF4498-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--BDD3B034C9D24559BA187C976DFF4498--> <SORT><![CDATA[Y]]></SORT>
@@ -385,7 +405,9 @@
<!--CD0E2A0608A24055BAE8B765AF211846--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--CD0E2A0608A24055BAE8B765AF211846-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--CD0E2A0608A24055BAE8B765AF211846-->
<AD_COLUMN_ID><![CDATA[9BAEEE4845EA38D8E040007F01002420]]></AD_COLUMN_ID>
-<!--CD0E2A0608A24055BAE8B765AF211846--> <NAME><![CDATA[Product
identifier]]></NAME>
+<!--CD0E2A0608A24055BAE8B765AF211846--> <NAME><![CDATA[Product]]></NAME>
+<!--CD0E2A0608A24055BAE8B765AF211846--> <DESCRIPTION><![CDATA[An item
produced by a process.]]></DESCRIPTION>
+<!--CD0E2A0608A24055BAE8B765AF211846--> <HELP><![CDATA[Identifies an item
which is either purchased or sold in this organization.]]></HELP>
<!--CD0E2A0608A24055BAE8B765AF211846-->
<PROPERTY><![CDATA[product._identifier]]></PROPERTY>
<!--CD0E2A0608A24055BAE8B765AF211846-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--CD0E2A0608A24055BAE8B765AF211846--> <SORT><![CDATA[Y]]></SORT>
@@ -463,7 +485,7 @@
<!--F476021BCB7E486AB4EF83C0E6936CFD--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--F476021BCB7E486AB4EF83C0E6936CFD-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--F476021BCB7E486AB4EF83C0E6936CFD-->
<AD_COLUMN_ID><![CDATA[9BAEEE4845F138D8E040007F01002420]]></AD_COLUMN_ID>
-<!--F476021BCB7E486AB4EF83C0E6936CFD--> <NAME><![CDATA[Pricelist
Price]]></NAME>
+<!--F476021BCB7E486AB4EF83C0E6936CFD--> <NAME><![CDATA[Price List
Price]]></NAME>
<!--F476021BCB7E486AB4EF83C0E6936CFD-->
<PROPERTY><![CDATA[netListPrice]]></PROPERTY>
<!--F476021BCB7E486AB4EF83C0E6936CFD-->
<ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
<!--F476021BCB7E486AB4EF83C0E6936CFD--> <SORT><![CDATA[Y]]></SORT>
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
