details: https://code.openbravo.com/erp/devel/pi/rev/b39a4d259c57
changeset: 33213:b39a4d259c57
user: Nono Carballo <nonofce <at> gmail.com>
date: Wed Jan 24 13:09:52 2018 +0100
summary: Fixes issue 37676: "Project Phase" field does not show any value
(although Project is selected) in Expense Sheet window
In callouts, for fields representing Ids, an empty string is returned instead
of null.
diffstat:
src/org/openbravo/erpCommon/ad_callouts/SE_Expense_BP_Project.java
| 8 ++++----
src/org/openbravo/erpCommon/ad_callouts/SE_InOut_Organization.java
| 2 +-
src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java
| 2 +-
src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java
| 10 +++++-----
src/org/openbravo/erpCommon/ad_callouts/SE_Order_Organization.java
| 2 +-
src/org/openbravo/erpCommon/ad_callouts/SE_Project_BPartner.java
| 8 ++++----
src/org/openbravo/erpCommon/ad_callouts/SE_Trxtype_Transaction.java
| 8 ++++----
src/org/openbravo/erpCommon/ad_callouts/SL_GlobalUse_Product.java
| 2 +-
src/org/openbravo/erpCommon/ad_callouts/SL_InOutLine_Product.java
| 2 +-
src/org/openbravo/erpCommon/ad_callouts/SL_InOut_BPartner.java
| 8 ++++----
src/org/openbravo/erpCommon/ad_callouts/SL_Internal_Consumption_Conversion.java
| 2 +-
src/org/openbravo/erpCommon/ad_callouts/SL_Internal_Consumption_Product.java
| 2 +-
src/org/openbravo/erpCommon/ad_callouts/SL_InvAmtUpd_ProductRefDate.java
| 2 +-
src/org/openbravo/erpCommon/ad_callouts/SL_Inventory_Product.java
| 2 +-
src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_DocType.java
| 2 +-
src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Product.java
| 2 +-
src/org/openbravo/erpCommon/ad_callouts/SL_Journal_MultiAcctSchema.java
| 2 +-
src/org/openbravo/erpCommon/ad_callouts/SL_Movement_Product.java
| 2 +-
src/org/openbravo/erpCommon/ad_callouts/SL_Order_DocType.java
| 2 +-
src/org/openbravo/erpCommon/ad_callouts/SL_Order_Product.java
| 10 +++++-----
src/org/openbravo/erpCommon/ad_callouts/SL_Production_Product.java
| 2 +-
src/org/openbravo/erpCommon/ad_callouts/SL_RefreshSequenceAndLength.java
| 4 ++--
src/org/openbravo/erpCommon/ad_callouts/SL_RequisitionLine_Product.java
| 2 +-
src/org/openbravo/erpCommon/ad_callouts/SL_SequenceProduct_Product.java
| 2 +-
24 files changed, 45 insertions(+), 45 deletions(-)
diffs (truncated from 426 to 300 lines):
diff -r 21e9102f2f7d -r b39a4d259c57
src/org/openbravo/erpCommon/ad_callouts/SE_Expense_BP_Project.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SE_Expense_BP_Project.java
Mon Jan 22 17:22:09 2018 +0100
+++ b/src/org/openbravo/erpCommon/ad_callouts/SE_Expense_BP_Project.java
Wed Jan 24 13:09:52 2018 +0100
@@ -40,8 +40,8 @@
// If project changed
if (StringUtils.equals(strChanged, "inpcProjectId")) {
// Reset Project Phase and Project Task fields
- info.addResult("inpcProjectphaseId", null);
- info.addResult("inpcProjecttaskId", null);
+ info.addResult("inpcProjectphaseId", "");
+ info.addResult("inpcProjecttaskId", "");
// If project changed, select project's business partner (if any).
if (StringUtils.isNotEmpty(strProjectId)) {
@@ -73,8 +73,8 @@
else {
strProjectId = SEExpenseBPProjectData.selectProjectId(this,
strBPartnerId);
info.addResult("inpcProjectId", strProjectId);
- info.addResult("inpcProjectphaseId", null);
- info.addResult("inpcProjecttaskId", null);
+ info.addResult("inpcProjectphaseId", "");
+ info.addResult("inpcProjecttaskId", "");
}
}
}
diff -r 21e9102f2f7d -r b39a4d259c57
src/org/openbravo/erpCommon/ad_callouts/SE_InOut_Organization.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SE_InOut_Organization.java
Mon Jan 22 17:22:09 2018 +0100
+++ b/src/org/openbravo/erpCommon/ad_callouts/SE_InOut_Organization.java
Wed Jan 24 13:09:52 2018 +0100
@@ -55,7 +55,7 @@
info.addResult("inpmWarehouseId", td[0].getField("id"));
}
} else {
- info.addResult("inpmWarehouseId", null);
+ info.addResult("inpmWarehouseId", "");
}
}
}
diff -r 21e9102f2f7d -r b39a4d259c57
src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java Mon Jan
22 17:22:09 2018 +0100
+++ b/src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java Wed Jan
24 13:09:52 2018 +0100
@@ -76,7 +76,7 @@
BpartnerMiscData[] data = BpartnerMiscData.select(this, strBPartner);
if (data == null || data.length == 0) {
- info.addResult("inpcBpartnerLocationId", null);
+ info.addResult("inpcBpartnerLocationId", "");
}
else {
diff -r 21e9102f2f7d -r b39a4d259c57
src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java Mon Jan
22 17:22:09 2018 +0100
+++ b/src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java Wed Jan
24 13:09:52 2018 +0100
@@ -151,7 +151,7 @@
}
info.endSelect();
} else {
- info.addResult("inpmWarehouseId", null);
+ info.addResult("inpmWarehouseId", "");
}
// Sales Representative
@@ -178,7 +178,7 @@
info.endSelect();
} else {
- info.addResult("inpsalesrepId", null);
+ info.addResult("inpsalesrepId", "");
}
// Invoice Rule
@@ -213,7 +213,7 @@
info.endSelect();
} else {
- info.addResult("inpinvoicerule", null);
+ info.addResult("inpinvoicerule", "");
}
// Project
@@ -282,7 +282,7 @@
info.endSelect();
} else {
- info.addResult("inpdeliveryrule", null);
+ info.addResult("inpdeliveryrule", "");
}
}
@@ -319,7 +319,7 @@
info.endSelect();
} else {
- info.addResult("inpadUserId", null);
+ info.addResult("inpadUserId", "");
}
// Message
diff -r 21e9102f2f7d -r b39a4d259c57
src/org/openbravo/erpCommon/ad_callouts/SE_Order_Organization.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SE_Order_Organization.java
Mon Jan 22 17:22:09 2018 +0100
+++ b/src/org/openbravo/erpCommon/ad_callouts/SE_Order_Organization.java
Wed Jan 24 13:09:52 2018 +0100
@@ -71,7 +71,7 @@
info.addResult("inpmWarehouseId", td[0].getField("id"));
}
} else {
- info.addResult("inpmWarehouseId", null);
+ info.addResult("inpmWarehouseId", "");
}
}
diff -r 21e9102f2f7d -r b39a4d259c57
src/org/openbravo/erpCommon/ad_callouts/SE_Project_BPartner.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SE_Project_BPartner.java Mon Jan
22 17:22:09 2018 +0100
+++ b/src/org/openbravo/erpCommon/ad_callouts/SE_Project_BPartner.java Wed Jan
24 13:09:52 2018 +0100
@@ -85,7 +85,7 @@
}
info.endSelect();
} else {
- info.addResult("inpcBpartnerLocationId", null);
+ info.addResult("inpcBpartnerLocationId", "");
}
// Sales Representative
@@ -108,7 +108,7 @@
}
info.endSelect();
} else {
- info.addResult("inpsalesrepId", null);
+ info.addResult("inpsalesrepId", "");
}
// Business Partner - User/Contacts
@@ -135,7 +135,7 @@
}
info.endSelect();
} else {
- info.addResult("inpadUserId", null);
+ info.addResult("inpadUserId", "");
}
// Business Partner - Bill To Address
@@ -164,7 +164,7 @@
}
info.endSelect();
} else {
- info.addResult("inpbilltoId", null);
+ info.addResult("inpbilltoId", "");
}
// Payment Rule, Payment Term, Price List, Payment Method
diff -r 21e9102f2f7d -r b39a4d259c57
src/org/openbravo/erpCommon/ad_callouts/SE_Trxtype_Transaction.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SE_Trxtype_Transaction.java
Mon Jan 22 17:22:09 2018 +0100
+++ b/src/org/openbravo/erpCommon/ad_callouts/SE_Trxtype_Transaction.java
Wed Jan 24 13:09:52 2018 +0100
@@ -30,17 +30,17 @@
final String strTrxType = info.getStringParameter("inptrxtype", null);
String strWindowId = info.getStringParameter("inpwindowId", null);
if ("BF".equals(strTrxType)) {
- info.addResult("inpfinPaymentId", null);
- info.addResult("inpcGlitemId", null);
+ info.addResult("inpfinPaymentId", "");
+ info.addResult("inpcGlitemId", "");
info.addResult("inpissotrx", "Y");
info.vars.setSessionValue(strWindowId + "|IsSOTrx", "Y");
} else if ("BPW".equals(strTrxType)) {
- info.addResult("inpfinPaymentId", null);
+ info.addResult("inpfinPaymentId", "");
info.addResult("inpdepositamt", BigDecimal.ZERO);
info.addResult("inpissotrx", "N");
info.vars.setSessionValue(strWindowId + "|IsSOTrx", "N");
} else if ("BPD".equals(strTrxType)) {
- info.addResult("inpfinPaymentId", null);
+ info.addResult("inpfinPaymentId", "");
info.addResult("inppaymentamt", BigDecimal.ZERO);
info.addResult("inpissotrx", "Y");
info.vars.setSessionValue(strWindowId + "|IsSOTrx", "Y");
diff -r 21e9102f2f7d -r b39a4d259c57
src/org/openbravo/erpCommon/ad_callouts/SL_GlobalUse_Product.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_GlobalUse_Product.java Mon Jan
22 17:22:09 2018 +0100
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_GlobalUse_Product.java Wed Jan
24 13:09:52 2018 +0100
@@ -90,7 +90,7 @@
}
info.endSelect();
} else {
- info.addResult("inpmProductUomId", null);
+ info.addResult("inpmProductUomId", "");
}
}
}
diff -r 21e9102f2f7d -r b39a4d259c57
src/org/openbravo/erpCommon/ad_callouts/SL_InOutLine_Product.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_InOutLine_Product.java Mon Jan
22 17:22:09 2018 +0100
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_InOutLine_Product.java Wed Jan
24 13:09:52 2018 +0100
@@ -161,7 +161,7 @@
}
info.endSelect();
} else {
- info.addResult("inpmProductUomId", null);
+ info.addResult("inpmProductUomId", "");
}
}
diff -r 21e9102f2f7d -r b39a4d259c57
src/org/openbravo/erpCommon/ad_callouts/SL_InOut_BPartner.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_InOut_BPartner.java Mon Jan
22 17:22:09 2018 +0100
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_InOut_BPartner.java Wed Jan
24 13:09:52 2018 +0100
@@ -89,7 +89,7 @@
}
info.endSelect();
} else {
- info.addResult("inpcBpartnerLocationId", null);
+ info.addResult("inpcBpartnerLocationId", "");
}
// Sales Representative
@@ -113,11 +113,11 @@
}
info.endSelect();
} else {
- info.addResult("inpsalesrepId", null);
+ info.addResult("inpsalesrepId", "");
}
// Project
- info.addResult("inpcProjectId", null);
+ info.addResult("inpcProjectId", "");
// Business Partner Contact
try {
@@ -143,7 +143,7 @@
}
info.endSelect();
} else {
- info.addResult("inpadUserId", null);
+ info.addResult("inpadUserId", "");
}
// Delivery Rule
diff -r 21e9102f2f7d -r b39a4d259c57
src/org/openbravo/erpCommon/ad_callouts/SL_Internal_Consumption_Conversion.java
---
a/src/org/openbravo/erpCommon/ad_callouts/SL_Internal_Consumption_Conversion.java
Mon Jan 22 17:22:09 2018 +0100
+++
b/src/org/openbravo/erpCommon/ad_callouts/SL_Internal_Consumption_Conversion.java
Wed Jan 24 13:09:52 2018 +0100
@@ -81,7 +81,7 @@
// Set Product UOM blank when Quantity Order is blank
if (StringUtils.equals(strChanged, "inpquantityorder") &&
StringUtils.isEmpty(strQuantityOrder)
&& StringUtils.isNotEmpty(strMProductUOMID)) {
- info.addResult("inpmProductUomId", null);
+ info.addResult("inpmProductUomId", "");
}
}
diff -r 21e9102f2f7d -r b39a4d259c57
src/org/openbravo/erpCommon/ad_callouts/SL_Internal_Consumption_Product.java
---
a/src/org/openbravo/erpCommon/ad_callouts/SL_Internal_Consumption_Product.java
Mon Jan 22 17:22:09 2018 +0100
+++
b/src/org/openbravo/erpCommon/ad_callouts/SL_Internal_Consumption_Product.java
Wed Jan 24 13:09:52 2018 +0100
@@ -99,7 +99,7 @@
}
info.endSelect();
} else {
- info.addResult("inpmProductUomId", null);
+ info.addResult("inpmProductUomId", "");
}
}
diff -r 21e9102f2f7d -r b39a4d259c57
src/org/openbravo/erpCommon/ad_callouts/SL_InvAmtUpd_ProductRefDate.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_InvAmtUpd_ProductRefDate.java
Mon Jan 22 17:22:09 2018 +0100
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_InvAmtUpd_ProductRefDate.java
Wed Jan 24 13:09:52 2018 +0100
@@ -65,7 +65,7 @@
if (StringUtils.equals(isWarehouseDimension, "N")) {
warehouseId = null;
- info.addResult("inpmWarehouseId", null);
+ info.addResult("inpmWarehouseId", "");
}
if (product == null) {
diff -r 21e9102f2f7d -r b39a4d259c57
src/org/openbravo/erpCommon/ad_callouts/SL_Inventory_Product.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Inventory_Product.java Mon Jan
22 17:22:09 2018 +0100
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Inventory_Product.java Wed Jan
24 13:09:52 2018 +0100
@@ -138,7 +138,7 @@
}
info.endSelect();
} else {
- info.addResult("inpmProductUomId", null);
+ info.addResult("inpmProductUomId", "");
}
}
diff -r 21e9102f2f7d -r b39a4d259c57
src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_DocType.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_DocType.java Mon Jan
22 17:22:09 2018 +0100
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_DocType.java Wed Jan
24 13:09:52 2018 +0100
@@ -66,7 +66,7 @@
info.addResult("inppaymentrule", "P");
} else {
// Payment Rule - No Form of Payment for non Credit Memos Document
type.
- info.addResult("inppaymentrule", null);
+ info.addResult("inppaymentrule", "");
}
}
}
diff -r 21e9102f2f7d -r b39a4d259c57
src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Product.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Product.java Mon Jan
22 17:22:09 2018 +0100
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Product.java Wed Jan
24 13:09:52 2018 +0100
@@ -239,7 +239,7 @@
}
info.endSelect();
} else {
- info.addResult("inpmProductUomId", null);
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
