0036621: It is possible to use UOM conversions of other clients in some callouts.

Description

It is possible to use UOM conversions of other clients in some callouts.

UOM conversions can be defined with different rates according the client using them. For instance, for a client one Bag can be defined as 100 Kg, but to other client one Bag could be 100.25 Kg.

Currently, some callouts are using the multiplyRate and divideRate of SL_Invoice_Conversion_data.xsql, these methods are not taking into account the session's client and it is causing that can be used incorrect conversions.

It is necessary to filter by client when searching for UOM conversions to avoid use an incorrect conversion.
You will find this bug in the following callouts:
- SL_CreateFromMultiple_Conversion
- SL_CreateLines_Conversion_UOM
- SL_GlobalUse_Conversion
- SL_InOut_Conversion
- SL_Internal_Consumption_Conversion
- SL_Inventory_Conversion
- SL_Invoice_Conversion
- SL_Movement_Conversion
- SL_Order_Conversion
- SL_Production_Conversion
- SL_SequenceProduct_Conversion

Steps To Reproduce

Login as System Admin Role
- Mark as displayed = Yes fields
  - Sales Invoice Lines: Order Quantity, Order Uom
  - Purchase Invoice Lines: Order Quantity, Order Uom
- Enable tabs related with Second UOM
  - Product Window | UOM tab
  - Unit of Measure | Conversion Tab
- Log Out and Login as QA Testing Admin.
- Create a new Product QA Product.
- Assign 2nd UOM Kilogram to previously created product (QA Product) in the UOM Tab
- Create a Sales Invoice
- Add a line and select the QA Product
- Select Kilogram in Order Uom and enter Order Quantity as 10
- Realize that message is shown as
    "Info
     No UOM Conversion Rate between UOMs found"
- Cancel Sales Invoice Line
- Navigate to Kilogram Unit of Measure and add conversion as
    - To Uom : Unit
      Multiple Rate by: 10
- Go to back to previous Sales Invoice
- Add a line and select the QA Product.
- Select Kilogram in Order Uom and enter Order Quantity as 10
- Realize that no message is shown and Invoiced Quantity is set as 100

- Log Out and Login as F&B Group Admin.
- Create a new Product FB Product.
- Assign 2nd UOM Kilogram to previously created product (FB Product) in the UOM Tab
- Go to Unit of Measure window and select Kilogram unit. Realize there are not conversions defined to it.
- Go to Unit of Measure window and select Unit. Notice there are not conversions defined to it.
- Create a Sales Invoice
- Add a line and select the FB Product
- Select Kilogram in Order Uom and enter Order Quantity as 10
- Realize that no message is shown and Invoiced Quantity is set as 100. Although there are not conversions defined between Unit and Kilogram it is using the conversion defined in QA client. An informative message should be shown as
    "Info
     No UOM Conversion Rate between UOMs found"
- Cancel Sales Invoice Line
- Navigate to Kilogram Unit of Measure and add conversion as
    - To Uom : Unit
      Multiple Rate by: 20
- Go to back to previous Sales Invoice
- Add a line and select the Test Product.
- Select Kilogram in Order Uom and enter Order Quantity as 10
- Realize that no message is shown and Invoiced Quantity is set as 200. Now it is using the right conversion rate.

- Log Out and Login as QA Testing Admin again. Now different conversions are defined for the same units in QA and F&B clients.
- Navigate to Kilogram Unit of Measure and realize exists the previously created conversion to Unit as
    - To Uom : Unit
      Multiple Rate by: 10
- Create a Sales Invoice
- Add a line and select the QA Product
- Select Kilogram in Order Uom and enter Order Quantity as 10
- Realize that no message is shown and Invoiced Quantity is set as 200.
  Notice that it is used Multiply Rate = 20, that it is defined in the F&B client. It is wrong and should be used the defined for the QA client with rate = 10.

Proposed Solution

Filter by client when getting the UOM conversion.

Attached you will find a proposed patch for affected callouts.

Tags

No tags attached.

Attached Files

36621.diff [^] (15,213 bytes) 2017-08-07 15:08 [Show Content] [Hide Content]

# HG changeset patch
# User Mark <markmm82@gmail.com>
# Date 1501696851 14400
#      Wed Aug 02 14:00:51 2017 -0400
# Node ID f1c68e4b5df730c3d3e39084d6c191e5c30f6b5c
# Parent  439855d2ed2633832a7e0504038a5cd3c0d06429
Added the client filter when find conversion rate between UOMs.

It avoids use conversions defined in other clients than used when callout is called.

diff --git a/src/org/openbravo/erpCommon/ad_callouts/SL_CreateFromMultiple_Conversion.java b/src/org/openbravo/erpCommon/ad_callouts/SL_CreateFromMultiple_Conversion.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_CreateFromMultiple_Conversion.java
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_CreateFromMultiple_Conversion.java
@@ -11,7 +11,7 @@
  * 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-2010 Openbravo SLU 
+ * All portions are Copyright (C) 2001-2017 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -78,11 +78,13 @@
     String strMultiplyRate;
     boolean check = false;
 
-    strMultiplyRate = SLInvoiceConversionData.multiplyRate(this, strInitUOM, localStrUOM);
+    strMultiplyRate = SLInvoiceConversionData.multiplyRate(this, strInitUOM, localStrUOM,
+        vars.getClient());
     if (strInitUOM.equals(localStrUOM))
       strMultiplyRate = "1";
     if (strMultiplyRate.equals(""))
-      strMultiplyRate = SLInvoiceConversionData.divideRate(this, localStrUOM, strInitUOM);
+      strMultiplyRate = SLInvoiceConversionData.divideRate(this, localStrUOM, strInitUOM,
+          vars.getClient());
     if (strMultiplyRate.equals("")) {
       strMultiplyRate = "1";
       if (!strMProductUOMID.equals(""))
diff --git a/src/org/openbravo/erpCommon/ad_callouts/SL_CreateLines_Conversion_UOM.java b/src/org/openbravo/erpCommon/ad_callouts/SL_CreateLines_Conversion_UOM.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_CreateLines_Conversion_UOM.java
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_CreateLines_Conversion_UOM.java
@@ -11,7 +11,7 @@
  * 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-2010 Openbravo SLU 
+ * All portions are Copyright (C) 2001-2017 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -75,11 +75,13 @@
     String strMultiplyRate;
     boolean check = false;
 
-    strMultiplyRate = SLInvoiceConversionData.multiplyRate(this, strInitUOM, strUOM);
+    strMultiplyRate = SLInvoiceConversionData.multiplyRate(this, strInitUOM, strUOM,
+        vars.getClient());
     if (strInitUOM.equals(strUOM))
       strMultiplyRate = "1";
     if (strMultiplyRate.equals(""))
-      strMultiplyRate = SLInvoiceConversionData.divideRate(this, strUOM, strInitUOM);
+      strMultiplyRate = SLInvoiceConversionData.divideRate(this, strUOM, strInitUOM,
+          vars.getClient());
     if (strMultiplyRate.equals("")) {
       strMultiplyRate = "1";
       if (!strMProductUOMID.equals(""))
diff --git a/src/org/openbravo/erpCommon/ad_callouts/SL_GlobalUse_Conversion.java b/src/org/openbravo/erpCommon/ad_callouts/SL_GlobalUse_Conversion.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_GlobalUse_Conversion.java
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_GlobalUse_Conversion.java
@@ -46,10 +46,12 @@
     String strInitUOM = SLInvoiceConversionData.initUOMId(this, strMProductUOMID);
     String strMultiplyRate = StringUtils.equals(strInitUOM, strUOM) ? "1" : "";
     if (StringUtils.isEmpty(strMultiplyRate)) {
-      strMultiplyRate = SLInvoiceConversionData.multiplyRate(this, strInitUOM, strUOM);
+      strMultiplyRate = SLInvoiceConversionData.multiplyRate(this, strInitUOM, strUOM,
+          info.vars.getClient());
     }
     if (StringUtils.isEmpty(strMultiplyRate)) {
-      strMultiplyRate = SLInvoiceConversionData.divideRate(this, strUOM, strInitUOM);
+      strMultiplyRate = SLInvoiceConversionData.divideRate(this, strUOM, strInitUOM,
+          info.vars.getClient());
     }
     if (StringUtils.isEmpty(strMultiplyRate)) {
       strMultiplyRate = "1";
diff --git a/src/org/openbravo/erpCommon/ad_callouts/SL_InOut_Conversion.java b/src/org/openbravo/erpCommon/ad_callouts/SL_InOut_Conversion.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_InOut_Conversion.java
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_InOut_Conversion.java
@@ -46,10 +46,12 @@
     String strInitUOM = SLInvoiceConversionData.initUOMId(this, strMProductUOMID);
     String strMultiplyRate = StringUtils.equals(strInitUOM, strUOM) ? "1" : "";
     if (StringUtils.isEmpty(strMultiplyRate)) {
-      strMultiplyRate = SLInvoiceConversionData.multiplyRate(this, strInitUOM, strUOM);
+      strMultiplyRate = SLInvoiceConversionData.multiplyRate(this, strInitUOM, strUOM,
+          info.vars.getClient());
     }
     if (StringUtils.isEmpty(strMultiplyRate)) {
-      strMultiplyRate = SLInvoiceConversionData.divideRate(this, strUOM, strInitUOM);
+      strMultiplyRate = SLInvoiceConversionData.divideRate(this, strUOM, strInitUOM,
+          info.vars.getClient());
     }
     // Set message when no UOM Conversion exists
     if (StringUtils.isEmpty(strMultiplyRate)) {
diff --git a/src/org/openbravo/erpCommon/ad_callouts/SL_Internal_Consumption_Conversion.java b/src/org/openbravo/erpCommon/ad_callouts/SL_Internal_Consumption_Conversion.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Internal_Consumption_Conversion.java
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Internal_Consumption_Conversion.java
@@ -43,19 +43,22 @@
     String strQuantityOrder = info.vars.getNumericParameter("inpquantityorder");
 
     // Multiple Rate for UOM Conversion if any
-    boolean check = false;
     String strInitUOM = SLInvoiceConversionData.initUOMId(this, strMProductUOMID);
     String strMultiplyRate = StringUtils.equals(strInitUOM, strUOM) ? "1" : "";
     if (StringUtils.isEmpty(strMultiplyRate)) {
-      strMultiplyRate = SLInvoiceConversionData.multiplyRate(this, strInitUOM, strUOM);
+      strMultiplyRate = SLInvoiceConversionData.multiplyRate(this, strInitUOM, strUOM,
+          info.vars.getClient());
     }
     if (StringUtils.isEmpty(strMultiplyRate)) {
-      strMultiplyRate = SLInvoiceConversionData.divideRate(this, strUOM, strInitUOM);
+      strMultiplyRate = SLInvoiceConversionData.divideRate(this, strUOM, strInitUOM,
+          info.vars.getClient());
     }
     if (StringUtils.isEmpty(strMultiplyRate)) {
       strMultiplyRate = "1";
       if (StringUtils.isNotEmpty(strMProductUOMID)) {
-        check = true;
+        // Set message when no UOM Conversion exists
+        info.showMessage(FormatUtilities.replaceJS(Utility.messageBD(this, "NoUOMConversion",
+            info.vars.getLanguage())));
       }
     }
 
@@ -83,10 +86,5 @@
       info.addResult("inpmProductUomId", null);
     }
 
-    // Set message when no UOM Conversion exists
-    if (check) {
-      info.showMessage(FormatUtilities.replaceJS(Utility.messageBD(this, "NoUOMConversion",
-          info.vars.getLanguage())));
-    }
   }
 }
diff --git a/src/org/openbravo/erpCommon/ad_callouts/SL_Inventory_Conversion.java b/src/org/openbravo/erpCommon/ad_callouts/SL_Inventory_Conversion.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Inventory_Conversion.java
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Inventory_Conversion.java
@@ -46,10 +46,12 @@
     String strInitUOM = SLInvoiceConversionData.initUOMId(this, strMProductUOMID);
     String strMultiplyRate = StringUtils.equals(strInitUOM, strUOM) ? "1" : "";
     if (StringUtils.isEmpty(strMultiplyRate)) {
-      strMultiplyRate = SLInvoiceConversionData.multiplyRate(this, strInitUOM, strUOM);
+      strMultiplyRate = SLInvoiceConversionData.multiplyRate(this, strInitUOM, strUOM,
+          info.vars.getClient());
     }
     if (StringUtils.isEmpty(strMultiplyRate)) {
-      strMultiplyRate = SLInvoiceConversionData.divideRate(this, strUOM, strInitUOM);
+      strMultiplyRate = SLInvoiceConversionData.divideRate(this, strUOM, strInitUOM,
+          info.vars.getClient());
     }
     if (StringUtils.isEmpty(strMultiplyRate)) {
       strMultiplyRate = "1";
diff --git a/src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Conversion.java b/src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Conversion.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Conversion.java
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Conversion.java
@@ -47,10 +47,12 @@
     boolean check = false;
     String strMultiplyRate = StringUtils.equals(strInitUOM, strUOM) ? "1" : "";
     if (StringUtils.isEmpty(strMultiplyRate)) {
-      strMultiplyRate = SLInvoiceConversionData.multiplyRate(this, strInitUOM, strUOM);
+      strMultiplyRate = SLInvoiceConversionData.multiplyRate(this, strInitUOM, strUOM,
+          info.vars.getClient());
     }
     if (StringUtils.isEmpty(strMultiplyRate)) {
-      strMultiplyRate = SLInvoiceConversionData.divideRate(this, strUOM, strInitUOM);
+      strMultiplyRate = SLInvoiceConversionData.divideRate(this, strUOM, strInitUOM,
+          info.vars.getClient());
     }
     if (StringUtils.isEmpty(strMultiplyRate)) {
       strMultiplyRate = "1";
diff --git a/src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Conversion_data.xsql b/src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Conversion_data.xsql
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Conversion_data.xsql
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Conversion_data.xsql
@@ -48,17 +48,19 @@
   <SqlMethod name="multiplyRate" type="preparedStatement" return="String" default="">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
-      SELECT MULTIPLYRATE FROM C_UOM_CONVERSION WHERE C_UOM_ID = ? AND C_UOM_TO_ID = ?
+      SELECT MULTIPLYRATE FROM C_UOM_CONVERSION WHERE C_UOM_ID = ? AND C_UOM_TO_ID = ? AND AD_CLIENT_ID = ?
     </Sql>
     <Parameter name="mProductUOM"/>
     <Parameter name="mProduct"/>
+    <Parameter name="client"/>
   </SqlMethod>
   <SqlMethod name="divideRate" type="preparedStatement" return="String" default="">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
-      SELECT DIVIDERATE FROM C_UOM_CONVERSION WHERE C_UOM_ID = ? AND C_UOM_TO_ID = ?
+      SELECT DIVIDERATE FROM C_UOM_CONVERSION WHERE C_UOM_ID = ? AND C_UOM_TO_ID = ? AND AD_CLIENT_ID = ?
     </Sql>
     <Parameter name="mProduct"/>
     <Parameter name="mProductUOM"/>
+    <Parameter name="client"/>
   </SqlMethod>
 </SqlClass>
diff --git a/src/org/openbravo/erpCommon/ad_callouts/SL_Movement_Conversion.java b/src/org/openbravo/erpCommon/ad_callouts/SL_Movement_Conversion.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Movement_Conversion.java
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Movement_Conversion.java
@@ -46,10 +46,12 @@
     String strInitUOM = SLInvoiceConversionData.initUOMId(this, strMProductUOMID);
     String strMultiplyRate = StringUtils.equals(strInitUOM, strUOM) ? "1" : "";
     if (StringUtils.isEmpty(strMultiplyRate)) {
-      strMultiplyRate = SLInvoiceConversionData.multiplyRate(this, strInitUOM, strUOM);
+      strMultiplyRate = SLInvoiceConversionData.multiplyRate(this, strInitUOM, strUOM,
+          info.vars.getClient());
     }
     if (StringUtils.isEmpty(strMultiplyRate)) {
-      strMultiplyRate = SLInvoiceConversionData.divideRate(this, strUOM, strInitUOM);
+      strMultiplyRate = SLInvoiceConversionData.divideRate(this, strUOM, strInitUOM,
+          info.vars.getClient());
     }
     if (StringUtils.isEmpty(strMultiplyRate)) {
       strMultiplyRate = "1";
diff --git a/src/org/openbravo/erpCommon/ad_callouts/SL_Order_Conversion.java b/src/org/openbravo/erpCommon/ad_callouts/SL_Order_Conversion.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Order_Conversion.java
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Order_Conversion.java
@@ -46,10 +46,12 @@
     String strInitUOM = SLInvoiceConversionData.initUOMId(this, strMProductUOMID);
     String strMultiplyRate = StringUtils.equals(strInitUOM, strUOM) ? "1" : "";
     if (StringUtils.isEmpty(strMultiplyRate)) {
-      strMultiplyRate = SLInvoiceConversionData.multiplyRate(this, strInitUOM, strUOM);
+      strMultiplyRate = SLInvoiceConversionData.multiplyRate(this, strInitUOM, strUOM,
+          info.vars.getClient());
     }
     if (StringUtils.isEmpty(strMultiplyRate)) {
-      strMultiplyRate = SLInvoiceConversionData.divideRate(this, strUOM, strInitUOM);
+      strMultiplyRate = SLInvoiceConversionData.divideRate(this, strUOM, strInitUOM,
+          info.vars.getClient());
     }
     if (StringUtils.isEmpty(strMultiplyRate)) {
       strMultiplyRate = "1";
diff --git a/src/org/openbravo/erpCommon/ad_callouts/SL_Production_Conversion.java b/src/org/openbravo/erpCommon/ad_callouts/SL_Production_Conversion.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Production_Conversion.java
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Production_Conversion.java
@@ -46,10 +46,12 @@
     String strInitUOM = SLInvoiceConversionData.initUOMId(this, strMProductUOMID);
     String strMultiplyRate = StringUtils.equals(strInitUOM, strUOM) ? "1" : "";
     if (StringUtils.isEmpty(strMultiplyRate)) {
-      strMultiplyRate = SLInvoiceConversionData.multiplyRate(this, strInitUOM, strUOM);
+      strMultiplyRate = SLInvoiceConversionData.multiplyRate(this, strInitUOM, strUOM,
+          info.vars.getClient());
     }
     if (StringUtils.isEmpty(strMultiplyRate)) {
-      strMultiplyRate = SLInvoiceConversionData.divideRate(this, strUOM, strInitUOM);
+      strMultiplyRate = SLInvoiceConversionData.divideRate(this, strUOM, strInitUOM,
+          info.vars.getClient());
     }
     if (StringUtils.isEmpty(strMultiplyRate)) {
       strMultiplyRate = "1";
diff --git a/src/org/openbravo/erpCommon/ad_callouts/SL_SequenceProduct_Conversion.java b/src/org/openbravo/erpCommon/ad_callouts/SL_SequenceProduct_Conversion.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_SequenceProduct_Conversion.java
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_SequenceProduct_Conversion.java
@@ -46,10 +46,12 @@
     String strInitUOM = SLInvoiceConversionData.initUOMId(this, strMProductUOMID);
     String strMultiplyRate = StringUtils.equals(strInitUOM, strUOM) ? "1" : "";
     if (StringUtils.isEmpty(strMultiplyRate)) {
-      strMultiplyRate = SLInvoiceConversionData.multiplyRate(this, strInitUOM, strUOM);
+      strMultiplyRate = SLInvoiceConversionData.multiplyRate(this, strInitUOM, strUOM,
+          info.vars.getClient());
     }
     if (StringUtils.isEmpty(strMultiplyRate)) {
-      strMultiplyRate = SLInvoiceConversionData.divideRate(this, strUOM, strInitUOM);
+      strMultiplyRate = SLInvoiceConversionData.divideRate(this, strUOM, strInitUOM,
+          info.vars.getClient());
     }
     if (StringUtils.isEmpty(strMultiplyRate)) {
       strMultiplyRate = "1";

Relationships [ Relation Graph ] [ Dependency Graph ]

related to

design defect

0036067

closed

markmm82

old callouts should be refactored to implement SimpleCallout

Notes
There are no notes attached to this issue.

Issue History
Date Modified	Username	Field	Change
2017-08-07 15:07	markmm82	New Issue
2017-08-07 15:07	markmm82	Assigned To	=> Triage Finance
2017-08-07 15:07	markmm82	Modules	=> Core
2017-08-07 15:07	markmm82	Triggers an Emergency Pack	=> No
2017-08-07 15:08	markmm82	File Added: 36621.diff
2017-08-07 15:20	markmm82	Description Updated	View Revisions
2017-08-07 15:43	markmm82	Steps to Reproduce Updated	View Revisions
2017-08-07 15:43	markmm82	Proposed Solution updated
2017-08-07 15:48	markmm82	Relationship added	depends on 0036067
2017-08-07 15:52	markmm82	Relationship deleted	depends on 0036067
2017-08-07 15:52	markmm82	Relationship added	related to 0036067