details: /erp/devel/main/rev/a3de80869813
changeset: 9077:a3de80869813
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Tue Dec 07 13:56:31 2010 +0100
summary: Issue 15062: File reformatted
details: /erp/devel/main/rev/992cf791e96e
changeset: 9078:992cf791e96e
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Tue Dec 07 14:09:53 2010 +0100
summary: Fixes issue 15062: Changed rowkey separator
The 'rowkey separator' is a character (or sequence of) that is used to build a
unique identifier per row. This is required by the Dojo based grid ajax
component.
The initial rowkey reparator was just '#' ans is too frequent in product or
business partners names, searchkey, etc. The separator was changed to a less
frequent sequence of characters: @_##_@
details: /erp/devel/main/rev/ee0cf8460654
changeset: 9079:ee0cf8460654
user: Stefan Hühner <stefan.huehner <at> openbravo.com>
date: Tue Dec 07 19:30:39 2010 +0100
summary: Fixed 15374: update dbsourcemanager.jar in pi to include fix done in
api-check
details: /erp/devel/main/rev/5f011dfcb6cd
changeset: 9080:5f011dfcb6cd
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Wed Dec 08 06:40:04 2010 +0000
summary: CI: promote changesets from pi to main
diffstat:
src-db/database/lib/dbsourcemanager.jar | 0
src-db/database/sourcedata/AD_MODULE.xml | 4 +-
src/org/openbravo/erpCommon/info/Account.html | 2 +-
src/org/openbravo/erpCommon/info/AccountElementValue.html | 2 +-
src/org/openbravo/erpCommon/info/AccountElementValue_data.xsql | 2 +-
src/org/openbravo/erpCommon/info/Account_data.xsql | 2 +-
src/org/openbravo/erpCommon/info/BusinessPartner.html | 2 +-
src/org/openbravo/erpCommon/info/BusinessPartnerMultiple.html | 2 +-
src/org/openbravo/erpCommon/info/BusinessPartnerMultiple_data.xsql | 2 +-
src/org/openbravo/erpCommon/info/BusinessPartner_data.xsql | 2 +-
src/org/openbravo/erpCommon/info/DebtPayment.html | 2 +-
src/org/openbravo/erpCommon/info/DebtPayment_data.xsql | 2 +-
src/org/openbravo/erpCommon/info/Invoice.html | 2 +-
src/org/openbravo/erpCommon/info/InvoiceLine.html | 2 +-
src/org/openbravo/erpCommon/info/InvoiceLine_data.xsql | 2 +-
src/org/openbravo/erpCommon/info/Invoice_data.xsql | 2 +-
src/org/openbravo/erpCommon/info/Locator.html | 2 +-
src/org/openbravo/erpCommon/info/Locator_data.xsql | 2 +-
src/org/openbravo/erpCommon/info/Product.html | 2 +-
src/org/openbravo/erpCommon/info/Product.java | 16 +-
src/org/openbravo/erpCommon/info/ProductComplete.html | 2 +-
src/org/openbravo/erpCommon/info/ProductComplete.java | 57
+++++----
src/org/openbravo/erpCommon/info/ProductComplete_data.xsql | 12 +-
src/org/openbravo/erpCommon/info/ProductMultiple.html | 2 +-
src/org/openbravo/erpCommon/info/ProductMultiple_data.xsql | 2 +-
src/org/openbravo/erpCommon/info/Project.html | 2 +-
src/org/openbravo/erpCommon/info/ProjectMultiple.html | 2 +-
src/org/openbravo/erpCommon/info/ProjectMultiple_data.xsql | 2 +-
src/org/openbravo/erpCommon/info/Project_data.xsql | 2 +-
src/org/openbravo/erpCommon/info/SalesOrder.html | 2 +-
src/org/openbravo/erpCommon/info/SalesOrderLine_data.xsql | 2 +-
src/org/openbravo/erpCommon/info/SalesOrder_data.xsql | 2 +-
src/org/openbravo/erpCommon/info/ShipmentReceipt_data.xsql | 2 +-
33 files changed, 77 insertions(+), 68 deletions(-)
diffs (truncated from 540 to 300 lines):
diff -r abe749f609f8 -r 5f011dfcb6cd src-db/database/lib/dbsourcemanager.jar
Binary file src-db/database/lib/dbsourcemanager.jar has changed
diff -r abe749f609f8 -r 5f011dfcb6cd src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/sourcedata/AD_MODULE.xml Thu Dec 02 19:19:21 2010 +0100
+++ b/src-db/database/sourcedata/AD_MODULE.xml Wed Dec 08 06:40:04 2010 +0000
@@ -6,7 +6,7 @@
<!--0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--0--> <NAME><![CDATA[Core]]></NAME>
-<!--0--> <VERSION><![CDATA[2.50.19053]]></VERSION>
+<!--0--> <VERSION><![CDATA[2.50.19079]]></VERSION>
<!--0--> <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION>
<!--0--> <HELP><![CDATA[Core module is the base one, all developments in core
are included as part of the standard Openbravo ERP.]]></HELP>
<!--0--> <URL><![CDATA[www.openbravo.com]]></URL>
@@ -22,7 +22,7 @@
<!--0--> <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
<!--0--> <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
<!--0--> <REFERENCEDATAINFO><![CDATA[Standard document types for orders,
invoices, etc. and settings]]></REFERENCEDATAINFO>
-<!--0--> <VERSION_LABEL><![CDATA[dev]]></VERSION_LABEL>
+<!--0--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
<!--0--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
<!--0--></AD_MODULE>
diff -r abe749f609f8 -r 5f011dfcb6cd
src/org/openbravo/erpCommon/info/Account.html
--- a/src/org/openbravo/erpCommon/info/Account.html Thu Dec 02 19:19:21
2010 +0100
+++ b/src/org/openbravo/erpCommon/info/Account.html Wed Dec 08 06:40:04
2010 +0000
@@ -87,7 +87,7 @@
function validateSelector(action) {
var keys; var key; var text;
if(action == 'SAVE') {
- keys = getSelectdText().split("#");
+ keys = getSelectdText().split("@_##_@");
key = keys[0];
text = keys[1];
}
diff -r abe749f609f8 -r 5f011dfcb6cd
src/org/openbravo/erpCommon/info/AccountElementValue.html
--- a/src/org/openbravo/erpCommon/info/AccountElementValue.html Thu Dec 02
19:19:21 2010 +0100
+++ b/src/org/openbravo/erpCommon/info/AccountElementValue.html Wed Dec 08
06:40:04 2010 +0000
@@ -64,7 +64,7 @@
var pos; var keys; var key; var text; var parameter;
if(action == "SAVE") {
pos = getSelectedPos();
- keys = getSelectedValues().split("#")
+ keys = getSelectedValues().split("@_##_@")
key = keys[0];
text = keys[1];
parameter = new Array(
diff -r abe749f609f8 -r 5f011dfcb6cd
src/org/openbravo/erpCommon/info/AccountElementValue_data.xsql
--- a/src/org/openbravo/erpCommon/info/AccountElementValue_data.xsql Thu Dec
02 19:19:21 2010 +0100
+++ b/src/org/openbravo/erpCommon/info/AccountElementValue_data.xsql Wed Dec
08 06:40:04 2010 +0000
@@ -30,7 +30,7 @@
SELECT * FROM ( SELECT '0' AS RN1, '' AS ID, A.* FROM (
SELECT C.C_ELEMENTVALUE_ID, C.VALUE as value, C.NAME as
name, C.DESCRIPTION,
C.AD_ORG_ID, (O.VALUE || ' - ' || O.NAME) AS AD_ORG_ID_D,
- C.C_ELEMENTVALUE_ID || '#' || C.NAME AS rowkey
+ C.C_ELEMENTVALUE_ID || '@_##_@' || C.NAME AS rowkey
FROM C_ELEMENTVALUE C,
AD_ORG O
WHERE EXISTS (SELECT 1 FROM C_ACCTSCHEMA_ELEMENT
diff -r abe749f609f8 -r 5f011dfcb6cd
src/org/openbravo/erpCommon/info/Account_data.xsql
--- a/src/org/openbravo/erpCommon/info/Account_data.xsql Thu Dec 02
19:19:21 2010 +0100
+++ b/src/org/openbravo/erpCommon/info/Account_data.xsql Wed Dec 08
06:40:04 2010 +0000
@@ -34,7 +34,7 @@
C.M_PRODUCT_ID, (P.NAME) AS M_PRODUCT_ID_D,
C.C_BPARTNER_ID, (B.NAME) AS C_BPARTNER_ID_D,
C.C_PROJECT_ID, (J.NAME || ' - ' || J.VALUE) AS
C_PROJECT_ID_D,
- C.C_CAMPAIGN_ID, (M.NAME) AS C_CAMPAIGN_ID_D,
C.C_VALIDCOMBINATION_ID || '#' || C.COMBINATION AS ROWKEY
+ C.C_CAMPAIGN_ID, (M.NAME) AS C_CAMPAIGN_ID_D,
C.C_VALIDCOMBINATION_ID || '@_##_@' || C.COMBINATION AS ROWKEY
FROM C_VALIDCOMBINATION C left join M_PRODUCT P on
C.M_PRODUCT_ID = P.M_PRODUCT_ID
left join C_BPARTNER B on
C.C_BPARTNER_ID = B.C_BPARTNER_ID
left join C_PROJECT J on
C.C_PROJECT_ID = J.C_PROJECT_ID
diff -r abe749f609f8 -r 5f011dfcb6cd
src/org/openbravo/erpCommon/info/BusinessPartner.html
--- a/src/org/openbravo/erpCommon/info/BusinessPartner.html Thu Dec 02
19:19:21 2010 +0100
+++ b/src/org/openbravo/erpCommon/info/BusinessPartner.html Wed Dec 08
06:40:04 2010 +0000
@@ -54,7 +54,7 @@
var pos; var keys; var key; var text; var parameter;
if(action == "SAVE") {
pos = getSelectedPos();
- keys = getSelectedValues().split("#")
+ keys = getSelectedValues().split("@_##_@")
key = keys[0];
text = keys[3];
parameter = new Array(
diff -r abe749f609f8 -r 5f011dfcb6cd
src/org/openbravo/erpCommon/info/BusinessPartnerMultiple.html
--- a/src/org/openbravo/erpCommon/info/BusinessPartnerMultiple.html Thu Dec
02 19:19:21 2010 +0100
+++ b/src/org/openbravo/erpCommon/info/BusinessPartnerMultiple.html Wed Dec
08 06:40:04 2010 +0000
@@ -74,7 +74,7 @@
data = new Array();
rows = dijit.byId('grid').getSelectedRows();
for(var i=0; i < rows.length; i++) {
- var rowkey = rows[i].split("#");
+ var rowkey = rows[i].split("@_##_@");
var rval = new Array(rowkey[0], rowkey[1]);
data.push(rval);
}
diff -r abe749f609f8 -r 5f011dfcb6cd
src/org/openbravo/erpCommon/info/BusinessPartnerMultiple_data.xsql
--- a/src/org/openbravo/erpCommon/info/BusinessPartnerMultiple_data.xsql
Thu Dec 02 19:19:21 2010 +0100
+++ b/src/org/openbravo/erpCommon/info/BusinessPartnerMultiple_data.xsql
Wed Dec 08 06:40:04 2010 +0000
@@ -30,7 +30,7 @@
SELECT * FROM ( SELECT '0' AS RN1, A.* FROM (
SELECT bp.C_BPartner_ID, bp.VALUE, bp.NAME as name,
replace(bp.NAME, '''', CHR(92) || '''') as name_hidden,
(bp.SO_CreditLimit-bp.SO_CreditUsed) AS SO_CreditAvailable,
bp.SO_CreditUsed,
- bp.ActualLifetimeValue, bp.URL, MAX(s.EMAIL) AS EMAIL,
MAX(sales.NAME) as SALESREP, bp.C_BPartner_ID || '#' || bp.NAME AS RowKey
+ bp.ActualLifetimeValue, bp.URL, MAX(s.EMAIL) AS EMAIL,
MAX(sales.NAME) as SALESREP, bp.C_BPartner_ID || '@_##_@' || bp.NAME AS RowKey
FROM C_BPARTNER_LOCATION l left join AD_USER c on
l.C_BPartner_Location_ID = c.C_BPartner_Location_ID and c.isactive='Y'
left join C_LOCATION a on
l.C_Location_ID=a.C_Location_ID
left join C_REGION on a.C_REGION_ID
= C_REGION.C_REGION_ID,
diff -r abe749f609f8 -r 5f011dfcb6cd
src/org/openbravo/erpCommon/info/BusinessPartner_data.xsql
--- a/src/org/openbravo/erpCommon/info/BusinessPartner_data.xsql Thu Dec
02 19:19:21 2010 +0100
+++ b/src/org/openbravo/erpCommon/info/BusinessPartner_data.xsql Wed Dec
08 06:40:04 2010 +0000
@@ -34,7 +34,7 @@
COALESCE(c.name,u.name) AS
Contact, COALESCE(c.ad_user_id,u.ad_user_id) as C_BPartner_Contact_ID,
bpl.Phone, l.Postal AS PC,
bpl.c_bpartner_location_id as
C_BPartner_Location_ID,
l.City, bp.ActualLifetimeValue
AS Income,
- bp.C_BPartner_ID || '#' ||
COALESCE(TO_CHAR(c.ad_user_id), TO_CHAR(u.ad_user_id), '') || '#' ||
COALESCE(TO_CHAR(bpl.c_bpartner_location_id),'') || '#' || bp.name AS rowKey
+ bp.C_BPartner_ID || '@_##_@' ||
COALESCE(TO_CHAR(c.ad_user_id), TO_CHAR(u.ad_user_id), '') || '@_##_@' ||
COALESCE(TO_CHAR(bpl.c_bpartner_location_id),'') || '@_##_@' || bp.name AS
rowKey
FROM C_BPARTNER bp left join
C_BPARTNER_LOCATION bpl on bp.c_bpartner_id = bpl.c_bpartner_id
and bpl.IsActive = 'Y'
left join
AD_USER c on bpl.c_bpartner_location_id = c.C_BPartner_Location_ID
diff -r abe749f609f8 -r 5f011dfcb6cd
src/org/openbravo/erpCommon/info/DebtPayment.html
--- a/src/org/openbravo/erpCommon/info/DebtPayment.html Thu Dec 02 19:19:21
2010 +0100
+++ b/src/org/openbravo/erpCommon/info/DebtPayment.html Wed Dec 08 06:40:04
2010 +0000
@@ -51,7 +51,7 @@
var pos; var keys; var key; var text; var parameter;
if(action == "SAVE") {
pos = getSelectedPos();
- keys = getSelectedValues().split("#")
+ keys = getSelectedValues().split("@_##_@")
key = keys[0];
text = keys[1];
}
diff -r abe749f609f8 -r 5f011dfcb6cd
src/org/openbravo/erpCommon/info/DebtPayment_data.xsql
--- a/src/org/openbravo/erpCommon/info/DebtPayment_data.xsql Thu Dec 02
19:19:21 2010 +0100
+++ b/src/org/openbravo/erpCommon/info/DebtPayment_data.xsql Wed Dec 08
06:40:04 2010 +0000
@@ -29,7 +29,7 @@
<Sql>
<![CDATA[
SELECT B.*,
- C_DEBT_PAYMENT_ID || '#' ||
Ad_Column_Identifier(TO_CHAR('C_Debt_Payment'), TO_CHAR(C_DEBT_PAYMENT_ID),
TO_CHAR(?)) AS ROWKEY,
+ C_DEBT_PAYMENT_ID || '@_##_@' ||
Ad_Column_Identifier(TO_CHAR('C_Debt_Payment'), TO_CHAR(C_DEBT_PAYMENT_ID),
TO_CHAR(?)) AS ROWKEY,
(SELECT COALESCE(RLT.NAME, RL.NAME) FROM AD_REF_LIST RL LEFT JOIN
AD_REF_LIST_TRL RLT on RL.AD_REF_LIST_ID = RLT.AD_REF_LIST_ID AND
RLT.AD_LANGUAGE = ?
WHERE B.payrule = RL.VALUE AND RL.AD_REFERENCE_ID = '195') AS
PAYMENTRULE,
(SELECT DOCUMENTNO FROM C_SETTLEMENT S1 WHERE S1.C_SETTLEMENT_ID =
b.C_SETTLEMENT_CANCEL_ID) AS DEBTCANCEL,
diff -r abe749f609f8 -r 5f011dfcb6cd
src/org/openbravo/erpCommon/info/Invoice.html
--- a/src/org/openbravo/erpCommon/info/Invoice.html Thu Dec 02 19:19:21
2010 +0100
+++ b/src/org/openbravo/erpCommon/info/Invoice.html Wed Dec 08 06:40:04
2010 +0000
@@ -51,7 +51,7 @@
var pos; var keys; var key; var text; var parameter;
if(action == "SAVE") {
pos = getSelectedPos();
- keys = getSelectedValues().split("#")
+ keys = getSelectedValues().split("@_##_@")
key = keys[0];
text = keys[1];
}
diff -r abe749f609f8 -r 5f011dfcb6cd
src/org/openbravo/erpCommon/info/InvoiceLine.html
--- a/src/org/openbravo/erpCommon/info/InvoiceLine.html Thu Dec 02 19:19:21
2010 +0100
+++ b/src/org/openbravo/erpCommon/info/InvoiceLine.html Wed Dec 08 06:40:04
2010 +0000
@@ -50,7 +50,7 @@
var pos; var keys; var key; var text; var parameter;
if(action == "SAVE") {
pos = getSelectedPos();
- keys = getSelectedValues().split("#")
+ keys = getSelectedValues().split("@_##_@")
key = keys[0];
text = keys[1];
}
diff -r abe749f609f8 -r 5f011dfcb6cd
src/org/openbravo/erpCommon/info/InvoiceLine_data.xsql
--- a/src/org/openbravo/erpCommon/info/InvoiceLine_data.xsql Thu Dec 02
19:19:21 2010 +0100
+++ b/src/org/openbravo/erpCommon/info/InvoiceLine_data.xsql Wed Dec 08
06:40:04 2010 +0000
@@ -30,7 +30,7 @@
<Sql>
<![CDATA[
SELECT B.*,
- C_INVOICELINE_ID || '#' || (DOCUMENTNO || ' - ' || DATEINVOICED
|| ' - ' || GRANDTOTAL || ' - ' || LINE || ' - ' || LINENETAMT) AS ROWKEY,
+ C_INVOICELINE_ID || '@_##_@' || (DOCUMENTNO || ' - ' ||
DATEINVOICED || ' - ' || GRANDTOTAL || ' - ' || LINE || ' - ' || LINENETAMT) AS
ROWKEY,
(DOCUMENTNO || ' - ' || DATEINVOICED || ' - ' || GRANDTOTAL ||
' - ' || LINE || ' - ' || LINENETAMT) AS LINE_TEXT
FROM ( SELECT '0' AS RN1, A.* FROM (
SELECT IL.C_INVOICELINE_ID, b.NAME AS BPARTNER_NAME, p.NAME
AS PRODUCT_NAME, I.DATEINVOICED, I.DOCUMENTNO,
diff -r abe749f609f8 -r 5f011dfcb6cd
src/org/openbravo/erpCommon/info/Invoice_data.xsql
--- a/src/org/openbravo/erpCommon/info/Invoice_data.xsql Thu Dec 02
19:19:21 2010 +0100
+++ b/src/org/openbravo/erpCommon/info/Invoice_data.xsql Wed Dec 08
06:40:04 2010 +0000
@@ -30,7 +30,7 @@
<Sql>
<![CDATA[
SELECT B.*,
- C_Invoice_ID || '#' || DocumentNo || ' - ' ||
TO_CHAR(DateInvoiced, TO_CHAR(?)) as RowKey,
+ C_Invoice_ID || '@_##_@' || DocumentNo || ' - ' ||
TO_CHAR(DateInvoiced, TO_CHAR(?)) as RowKey,
C_Base_Convert(GrandTotal, C_Currency_ID, AD_Client_ID,
DateAcct, '0') AS ConvertedAmount,
DocumentNo||' - '||TO_CHAR(DateInvoiced,to_char(?))||' -
'||GrandTotal AS Name,
REPLACE(DocumentNo||' - '||TO_CHAR(DateInvoiced,to_char(?))||'
- '||GrandTotal, '''', CHR(92) || '''') AS Name_HIDDEN, '' AS value
diff -r abe749f609f8 -r 5f011dfcb6cd
src/org/openbravo/erpCommon/info/Locator.html
--- a/src/org/openbravo/erpCommon/info/Locator.html Thu Dec 02 19:19:21
2010 +0100
+++ b/src/org/openbravo/erpCommon/info/Locator.html Wed Dec 08 06:40:04
2010 +0000
@@ -53,7 +53,7 @@
var pos; var keys; var key; var text; var parameter;
if(action == "SAVE") {
pos = getSelectedPos();
- keys = getSelectedValues().split("#")
+ keys = getSelectedValues().split("@_##_@")
key = keys[0];
text = keys[1];
}
diff -r abe749f609f8 -r 5f011dfcb6cd
src/org/openbravo/erpCommon/info/Locator_data.xsql
--- a/src/org/openbravo/erpCommon/info/Locator_data.xsql Thu Dec 02
19:19:21 2010 +0100
+++ b/src/org/openbravo/erpCommon/info/Locator_data.xsql Wed Dec 08
06:40:04 2010 +0000
@@ -31,7 +31,7 @@
SELECT * FROM ( SELECT '0' AS RN1, A.* FROM (
SELECT m.M_LOCATOR_ID, mw.NAME, m.VALUE,
REPLACE(AD_COLUMN_IDENTIFIER(TO_CHAR('M_LOCATOR'), TO_CHAR(m.M_LOCATOR_ID),
TO_CHAR(?)), '''', chr(92)||'''') AS VALUE_HIDDEN, m.PRIORITYNO,
m.ISDEFAULT, m.X AS aisle, m.Y AS bin, m.Z AS nivel,
- m.M_LOCATOR_ID || '#' || m.value AS rowKey
+ m.M_LOCATOR_ID || '@_##_@' || m.value AS rowKey
FROM M_LOCATOR m, M_WAREHOUSE mw,Ad_Org ao
WHERE m.M_WAREHOUSE_ID = mw.M_WAREHOUSE_ID
AND mw.AD_Client_ID IN ('1')
diff -r abe749f609f8 -r 5f011dfcb6cd
src/org/openbravo/erpCommon/info/Product.html
--- a/src/org/openbravo/erpCommon/info/Product.html Thu Dec 02 19:19:21
2010 +0100
+++ b/src/org/openbravo/erpCommon/info/Product.html Wed Dec 08 06:40:04
2010 +0000
@@ -53,7 +53,7 @@
var pos; var keys; var key; var text; var parameter;
if(action == "SAVE") {
pos = getSelectedPos();
- keys = getSelectedValues().split("#")
+ keys = getSelectedValues().split("@_##_@")
key = keys[0];
text = keys[1];
parameter = new Array(
diff -r abe749f609f8 -r 5f011dfcb6cd
src/org/openbravo/erpCommon/info/Product.java
--- a/src/org/openbravo/erpCommon/info/Product.java Thu Dec 02 19:19:21
2010 +0100
+++ b/src/org/openbravo/erpCommon/info/Product.java Wed Dec 08 06:40:04
2010 +0000
@@ -49,6 +49,7 @@
"pricestd", "qtyonhand", "qtyordered", "margin", "pricelimit", "rowkey"
};
private static final RequestFilter columnFilter = new
ValueListFilter(colNames);
private static final RequestFilter directionFilter = new
ValueListFilter("asc", "desc");
+ private static final String ROWKEY_SEPARATOR = "@_##_@";
public void init(ServletConfig config) {
super.init(config);
@@ -491,12 +492,15 @@
// Building rowKey
if (columnname.equalsIgnoreCase("rowkey")) {
final StringBuffer rowKey = new StringBuffer();
- rowKey.append(data[j].getField("mProductId")).append("#");
- rowKey.append(data[j].getField("name")).append("#");
- rowKey.append(data[j].getField("cUomId")).append("#");
- rowKey.append(df.format(new
BigDecimal(data[j].getField("pricelist")))).append("#");
- rowKey.append(df.format(new
BigDecimal(data[j].getField("pricestd")))).append("#");
- rowKey.append(df.format(new
BigDecimal(data[j].getField("pricelimit")))).append("#");
+
rowKey.append(data[j].getField("mProductId")).append(ROWKEY_SEPARATOR);
+ rowKey.append(data[j].getField("name")).append(ROWKEY_SEPARATOR);
+ rowKey.append(data[j].getField("cUomId")).append(ROWKEY_SEPARATOR);
+ rowKey.append(df.format(new
BigDecimal(data[j].getField("pricelist")))).append(
+ ROWKEY_SEPARATOR);
+ rowKey.append(df.format(new
BigDecimal(data[j].getField("pricestd")))).append(
+ ROWKEY_SEPARATOR);
+ rowKey.append(df.format(new
BigDecimal(data[j].getField("pricelimit")))).append(
+ ROWKEY_SEPARATOR);
rowKey.append(data[j].getField("cCurrencyId"));
strRowsData.append(rowKey);
} else if (columnname.equalsIgnoreCase("pricelist")
diff -r abe749f609f8 -r 5f011dfcb6cd
src/org/openbravo/erpCommon/info/ProductComplete.html
--- a/src/org/openbravo/erpCommon/info/ProductComplete.html Thu Dec 02
19:19:21 2010 +0100
+++ b/src/org/openbravo/erpCommon/info/ProductComplete.html Wed Dec 08
06:40:04 2010 +0000
@@ -53,7 +53,7 @@
var pos; var keys; var key; var text; var parameter;
if(action == "SAVE") {
pos = getSelectedPos();
- keys = getSelectedValues().split("#")
+ keys = getSelectedValues().split("@_##_@")
key = keys[0];
text = keys[1];
parameter = new Array(
diff -r abe749f609f8 -r 5f011dfcb6cd
src/org/openbravo/erpCommon/info/ProductComplete.java
--- a/src/org/openbravo/erpCommon/info/ProductComplete.java Thu Dec 02
19:19:21 2010 +0100
+++ b/src/org/openbravo/erpCommon/info/ProductComplete.java Wed Dec 08
06:40:04 2010 +0000
@@ -4,14 +4,14 @@
* Version 1.0 (the "License"), being the Mozilla Public License
* Version 1.1 with a permitted attribution clause; you may not use this
* file except in compliance with the License. You may obtain a copy of
- * the License at http://www.openbravo.com/legal/license.html
+ * the License at http://www.openbravo.com/legal/license.html
* Software distributed under the License is distributed on an "AS IS"
* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
* License for the specific language governing rights and limitations
- * under the License.
- * The Original Code is Openbravo ERP.
+ * 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): ______________________________________.
************************************************************************
@@ -48,6 +48,7 @@
"attribute", "qtyorder", "c_uom2", "qty_ref", "quantityorder_ref",
"rowkey" };
private static final RequestFilter columnFilter = new
ValueListFilter(colNames);
private static final RequestFilter directionFilter = new
ValueListFilter("asc", "desc");
+ private static final String ROWKEY_SEPARATOR = "@_##_@";
------------------------------------------------------------------------------
What happens now with your Lotus Notes apps - do you make another costly
upgrade, or settle for being marooned without product support? Time to move
off Lotus Notes and onto the cloud with Force.com, apps are easier to build,
use, and manage than apps on traditional platforms. Sign up for the Lotus
Notes Migration Kit to learn more. http://p.sf.net/sfu/salesforce-d2d
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
