details: /erp/devel/pi/rev/493535b2d705
changeset: 11334:493535b2d705
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Wed Mar 16 12:37:25 2011 +0100
summary: Fixes issue 0016321: Not possible to modify available fields of
Discount line when order is processed
It has been hidden the fields Business Partner and Partner Address for lines
that are discounts. It has been removed the mandatory flag for Partner address
and it has been added this removed logic to the trigger. Now Partner Address is
mandatory only for lines that are not discounts.
details: /erp/devel/pi/rev/2b7481b1b4a3
changeset: 11335:2b7481b1b4a3
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Fri Mar 18 15:46:30 2011 +0100
summary: Fixes issue 0016069: Sales order line selector not working fine
working together a standard process
It has been added the new separator sequence for all SQL order lines and has
been modified also the javacript code that analises this separator sequence
details: /erp/devel/pi/rev/77a6c2e1164a
changeset: 11336:77a6c2e1164a
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Mon Mar 21 14:02:53 2011 +0100
summary: Fixes issue 0016069: Sales order line selector not working fine
working together a standard process
It has been added a new SQL separator also for the Shipments and Shipments
lines selector to avoid the problem in these selectors too
diffstat:
src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml | 7 ++++++
src-db/database/sourcedata/AD_COLUMN.xml | 2 +-
src-db/database/sourcedata/AD_FIELD.xml | 4 +-
src-db/database/sourcedata/AD_MESSAGE.xml | 11
++++++++++
src/org/openbravo/erpCommon/info/SalesOrderLine.html | 2 +-
src/org/openbravo/erpCommon/info/SalesOrderLine_data.xsql | 2 +-
src/org/openbravo/erpCommon/info/ShipmentReceipt.html | 2 +-
src/org/openbravo/erpCommon/info/ShipmentReceiptLine.html | 2 +-
src/org/openbravo/erpCommon/info/ShipmentReceiptLine_data.xsql | 6 ++--
9 files changed, 28 insertions(+), 10 deletions(-)
diffs (149 lines):
diff -r 8343759379cd -r 77a6c2e1164a
src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml
--- a/src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml Tue Mar
22 11:03:01 2011 +0100
+++ b/src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml Mon Mar
21 14:02:53 2011 +0100
@@ -77,6 +77,13 @@
END IF;
END IF;
END IF;
+
+ IF(UPDATING OR INSERTING) THEN
+ IF (:NEW.C_BPARTNER_ID IS NOT NULL AND :NEW.C_BPARTNER_LOCATION_ID IS
NULL) THEN
+ RAISE_APPLICATION_ERROR(-20000, '@LocationNotNullConstraint@');
+ END IF;
+ END IF;
+
IF(DELETING OR INSERTING) THEN
SELECT PROCESSED,
DOCACTION
diff -r 8343759379cd -r 77a6c2e1164a src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Tue Mar 22 11:03:01 2011 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Mon Mar 21 14:02:53 2011 +0100
@@ -55163,7 +55163,7 @@
<!--3404--> <DEFAULTVALUE><![CDATA[@C_BPartner_Location_ID@]]></DEFAULTVALUE>
<!--3404--> <ISKEY><![CDATA[N]]></ISKEY>
<!--3404--> <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--3404--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--3404--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
<!--3404--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
<!--3404--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
<!--3404--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
diff -r 8343759379cd -r 77a6c2e1164a src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Tue Mar 22 11:03:01 2011 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml Mon Mar 21 14:02:53 2011 +0100
@@ -21441,7 +21441,7 @@
<!--1574--> <AD_TAB_ID><![CDATA[187]]></AD_TAB_ID>
<!--1574--> <AD_COLUMN_ID><![CDATA[2764]]></AD_COLUMN_ID>
<!--1574--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--1574--> <DISPLAYLOGIC><![CDATA[@OrderType@='OB' | @OrderType@='SO' |
@OrderType@='WP' | @Processed@='Y']]></DISPLAYLOGIC>
+<!--1574--> <DISPLAYLOGIC><![CDATA[(@OrderType@='OB' | @OrderType@='SO' |
@OrderType@='WP' | @Processed@='Y') & @C_Order_Discount_ID@='']]></DISPLAYLOGIC>
<!--1574--> <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
<!--1574--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
<!--1574--> <SEQNO><![CDATA[40]]></SEQNO>
@@ -31329,7 +31329,7 @@
<!--2595--> <AD_TAB_ID><![CDATA[187]]></AD_TAB_ID>
<!--2595--> <AD_COLUMN_ID><![CDATA[3404]]></AD_COLUMN_ID>
<!--2595--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--2595--> <DISPLAYLOGIC><![CDATA[@OrderType@='OB' | @OrderType@='SO' |
@OrderType@='WP' | @Processed@='Y']]></DISPLAYLOGIC>
+<!--2595--> <DISPLAYLOGIC><![CDATA[(@OrderType@='OB' | @OrderType@='SO' |
@OrderType@='WP' | @Processed@='Y') & @C_Order_Discount_ID@='']]></DISPLAYLOGIC>
<!--2595--> <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
<!--2595--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
<!--2595--> <SEQNO><![CDATA[50]]></SEQNO>
diff -r 8343759379cd -r 77a6c2e1164a src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml Tue Mar 22 11:03:01 2011 +0100
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml Mon Mar 21 14:02:53 2011 +0100
@@ -34024,6 +34024,17 @@
<!--EF6ECE31E8474A289803BC07D3774F17-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--EF6ECE31E8474A289803BC07D3774F17--></AD_MESSAGE>
+<!--EF95449A17A04724B44873FD5EEFD249--><AD_MESSAGE>
+<!--EF95449A17A04724B44873FD5EEFD249-->
<AD_MESSAGE_ID><![CDATA[EF95449A17A04724B44873FD5EEFD249]]></AD_MESSAGE_ID>
+<!--EF95449A17A04724B44873FD5EEFD249-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EF95449A17A04724B44873FD5EEFD249--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EF95449A17A04724B44873FD5EEFD249--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EF95449A17A04724B44873FD5EEFD249-->
<VALUE><![CDATA[LocationNotNullConstraint]]></VALUE>
+<!--EF95449A17A04724B44873FD5EEFD249--> <MSGTEXT><![CDATA[The field Partner
Address is mandatory and cannot be left empty.]]></MSGTEXT>
+<!--EF95449A17A04724B44873FD5EEFD249--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--EF95449A17A04724B44873FD5EEFD249-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--EF95449A17A04724B44873FD5EEFD249--></AD_MESSAGE>
+
<!--F17014A0E42A487A9D9AEDBA41A87620--><AD_MESSAGE>
<!--F17014A0E42A487A9D9AEDBA41A87620-->
<AD_MESSAGE_ID><![CDATA[F17014A0E42A487A9D9AEDBA41A87620]]></AD_MESSAGE_ID>
<!--F17014A0E42A487A9D9AEDBA41A87620-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 8343759379cd -r 77a6c2e1164a
src/org/openbravo/erpCommon/info/SalesOrderLine.html
--- a/src/org/openbravo/erpCommon/info/SalesOrderLine.html Tue Mar 22
11:03:01 2011 +0100
+++ b/src/org/openbravo/erpCommon/info/SalesOrderLine.html Mon Mar 21
14:02:53 2011 +0100
@@ -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];
}
diff -r 8343759379cd -r 77a6c2e1164a
src/org/openbravo/erpCommon/info/SalesOrderLine_data.xsql
--- a/src/org/openbravo/erpCommon/info/SalesOrderLine_data.xsql Tue Mar 22
11:03:01 2011 +0100
+++ b/src/org/openbravo/erpCommon/info/SalesOrderLine_data.xsql Mon Mar 21
14:02:53 2011 +0100
@@ -121,7 +121,7 @@
SELECT ol.C_ORDERLINE_ID, b.NAME AS BPARTNER_NAME, p.NAME AS
PRODUCT_NAME, ol.DATEORDERED, o.DOCUMENTNO,
o.ISSOTRX, ol.QTYORDERED AS QTY, ol.PRICEACTUAL, ol.LINENETAMT,
(o.DOCUMENTNO || ' - ' || ol.DATEORDERED || ' - ' || o.GRANDTOTAL ||
' - ' || ol.LINE || ' - ' || ol.LINENETAMT) AS LINE_TEXT,
- ol.C_ORDERLINE_ID || '#' || o.DOCUMENTNO || ' - ' ||
ol.DATEORDERED || ' - ' || o.GRANDTOTAL || ' - ' || ol.LINE || ' - ' ||
ol.LINENETAMT as rowkey
+ ol.C_ORDERLINE_ID || '@_##_@' || o.DOCUMENTNO || ' -
' || ol.DATEORDERED || ' - ' || o.GRANDTOTAL || ' - ' || ol.LINE || ' - ' ||
ol.LINENETAMT as rowkey
FROM C_ORDERLINE ol left join M_MATCHPO mp on ol.C_ORDERLINE_ID =
mp.C_ORDERLINE_ID
AND mp.C_INVOICELINE_ID IS
NOT NULL
left join M_MATCHPO mp2 on ol.C_ORDERLINE_ID =
mp2.C_ORDERLINE_ID
diff -r 8343759379cd -r 77a6c2e1164a
src/org/openbravo/erpCommon/info/ShipmentReceipt.html
--- a/src/org/openbravo/erpCommon/info/ShipmentReceipt.html Tue Mar 22
11:03:01 2011 +0100
+++ b/src/org/openbravo/erpCommon/info/ShipmentReceipt.html Mon Mar 21
14:02:53 2011 +0100
@@ -58,7 +58,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 8343759379cd -r 77a6c2e1164a
src/org/openbravo/erpCommon/info/ShipmentReceiptLine.html
--- a/src/org/openbravo/erpCommon/info/ShipmentReceiptLine.html Tue Mar 22
11:03:01 2011 +0100
+++ b/src/org/openbravo/erpCommon/info/ShipmentReceiptLine.html Mon Mar 21
14:02:53 2011 +0100
@@ -65,7 +65,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 8343759379cd -r 77a6c2e1164a
src/org/openbravo/erpCommon/info/ShipmentReceiptLine_data.xsql
--- a/src/org/openbravo/erpCommon/info/ShipmentReceiptLine_data.xsql Tue Mar
22 11:03:01 2011 +0100
+++ b/src/org/openbravo/erpCommon/info/ShipmentReceiptLine_data.xsql Mon Mar
21 14:02:53 2011 +0100
@@ -33,7 +33,7 @@
m.ISSOTRX, ml.MOVEMENTQTY AS QTY, l.VALUE AS LOCATOR_NAME,
a.DESCRIPTION AS ATTRIBUTE_NAME,
(ml.LINE || ' - ' || ml.MOVEMENTQTY || ' - ' || m.DOCUMENTNO || ' -
' || m.MOVEMENTDATE ||
' - ' || p.NAME) AS LINE_TEXT,
- ml.M_INOUTLINE_ID || '#' || (ml.LINE ||
' - ' || ml.MOVEMENTQTY || ' - ' || m.DOCUMENTNO || ' - ' || m.MOVEMENTDATE ||
+ ml.M_INOUTLINE_ID || '@_##_@' ||
(ml.LINE || ' - ' || ml.MOVEMENTQTY || ' - ' || m.DOCUMENTNO || ' - ' ||
m.MOVEMENTDATE ||
' - ' || p.NAME) as rowkey
FROM M_INOUTLINE ml left join M_ATTRIBUTESETINSTANCE a on
ml.M_ATTRIBUTESETINSTANCE_ID = a.M_ATTRIBUTESETINSTANCE_ID
left join M_LOCATOR l on ml.M_LOCATOR_ID =
l.M_LOCATOR_ID,
@@ -80,7 +80,7 @@
m.ISSOTRX, ml.MOVEMENTQTY AS QTY, l.VALUE AS LOCATOR_NAME,
a.DESCRIPTION AS ATTRIBUTE_NAME,
(ml.LINE || ' - ' || ml.MOVEMENTQTY || ' - ' || m.DOCUMENTNO || ' -
' || m.MOVEMENTDATE ||
' - ' || p.NAME) AS LINE_TEXT,
- ml.M_INOUTLINE_ID || '#' || (ml.LINE || ' - ' ||
ml.MOVEMENTQTY || ' - ' || m.DOCUMENTNO || ' - ' || m.MOVEMENTDATE ||
+ ml.M_INOUTLINE_ID || '@_##_@' || (ml.LINE || ' - ' ||
ml.MOVEMENTQTY || ' - ' || m.DOCUMENTNO || ' - ' || m.MOVEMENTDATE ||
' - ' || p.NAME) as rowkey
FROM M_INOUTLINE ml left join M_ATTRIBUTESETINSTANCE a on
ml.M_ATTRIBUTESETINSTANCE_ID = a.M_ATTRIBUTESETINSTANCE_ID
left join M_LOCATOR l on ml.M_LOCATOR_ID =
l.M_LOCATOR_ID,
@@ -160,7 +160,7 @@
m.ISSOTRX, ml.MOVEMENTQTY AS QTY, l.VALUE AS LOCATOR_NAME,
a.DESCRIPTION AS ATTRIBUTE_NAME,
(ml.LINE || ' - ' || ml.MOVEMENTQTY || ' - ' || m.DOCUMENTNO || ' -
' || m.MOVEMENTDATE ||
' - ' || p.NAME) AS LINE_TEXT,
- ml.M_INOUTLINE_ID || '#' || (ml.LINE ||
' - ' || ml.MOVEMENTQTY || ' - ' || m.DOCUMENTNO || ' - ' || m.MOVEMENTDATE ||
+ ml.M_INOUTLINE_ID || '@_##_@' ||
(ml.LINE || ' - ' || ml.MOVEMENTQTY || ' - ' || m.DOCUMENTNO || ' - ' ||
m.MOVEMENTDATE ||
' - ' || p.NAME) as rowkey
FROM M_INOUTLINE ml left join M_ATTRIBUTESETINSTANCE a on
ml.M_ATTRIBUTESETINSTANCE_ID = a.M_ATTRIBUTESETINSTANCE_ID
left join M_LOCATOR l on ml.M_LOCATOR_ID =
l.M_LOCATOR_ID
------------------------------------------------------------------------------
Enable your software for Intel(R) Active Management Technology to meet the
growing manageability and security demands of your customers. Businesses
are taking advantage of Intel(R) vPro (TM) technology - will your software
be a part of the solution? Download the Intel(R) Manageability Checker
today! http://p.sf.net/sfu/intel-dev2devmar
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
