details: https://code.openbravo.com/erp/devel/pi/rev/1168e004ce35
changeset: 28052:1168e004ce35
user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com>
date: Wed Nov 25 19:04:45 2015 +0100
summary: Fixes issue 31322: Sales Representative defined for logged user
should be used
Sales representative defined for logged user should be used in case sales
order, goods receipt or sales invoice business partner does not have a sales
representative defined.
diffstat:
src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java | 6 +++++-
src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java | 4 ++++
src/org/openbravo/erpCommon/ad_callouts/SL_InOut_BPartner.java | 6 +++++-
3 files changed, 14 insertions(+), 2 deletions(-)
diffs (68 lines):
diff -r 2d31b78e38c9 -r 1168e004ce35
src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java Thu Nov
26 11:09:59 2015 +0100
+++ b/src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java Wed Nov
25 19:04:45 2015 +0100
@@ -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-2014 Openbravo SLU
+ * All portions are Copyright (C) 2001-2015 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -27,6 +27,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.lang.StringUtils;
import org.hibernate.criterion.Restrictions;
import org.openbravo.advpaymentmngt.utility.FIN_Utility;
import org.openbravo.base.secureApp.HttpSecureAppServlet;
@@ -110,6 +111,9 @@
else {
resultado.append("var respuesta = new Array(");
strUserRep = SEOrderBPartnerData.userIdSalesRep(this,
data[0].salesrepId);
+ if (StringUtils.isEmpty(strUserRep)) {
+ strUserRep = vars.getUser();
+ }
String strPriceList = (strIsSOTrx.equals("Y") ? data[0].mPricelistId :
data[0].poPricelistId);
if (strPriceList.equalsIgnoreCase("")) {
strPriceList = SEOrderBPartnerData.defaultPriceList(this, strIsSOTrx,
vars.getClient());
diff -r 2d31b78e38c9 -r 1168e004ce35
src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java Thu Nov
26 11:09:59 2015 +0100
+++ b/src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java Wed Nov
25 19:04:45 2015 +0100
@@ -22,6 +22,7 @@
import javax.servlet.ServletException;
+import org.apache.commons.lang.StringUtils;
import org.openbravo.advpaymentmngt.utility.FIN_Utility;
import org.openbravo.dal.service.OBDal;
import org.openbravo.data.FieldProvider;
@@ -58,6 +59,9 @@
strDeliveryRule = data[0].deliveryrule.equals("") ? info.vars
.getStringParameter("inpdeliveryrule") : data[0].deliveryrule;
strUserRep = SEOrderBPartnerData.userIdSalesRep(this,
data[0].salesrepId);
+ if (StringUtils.isEmpty(strUserRep)) {
+ strUserRep = info.vars.getUser();
+ }
SLOrderDocTypeData[] docTypeData = SLOrderDocTypeData.select(this,
strDocTypeTarget);
if (docTypeData != null && docTypeData.length > 0) {
docSubTypeSO = docTypeData[0].docsubtypeso;
diff -r 2d31b78e38c9 -r 1168e004ce35
src/org/openbravo/erpCommon/ad_callouts/SL_InOut_BPartner.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_InOut_BPartner.java Thu Nov
26 11:09:59 2015 +0100
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_InOut_BPartner.java Wed Nov
25 19:04:45 2015 +0100
@@ -89,8 +89,12 @@
BpartnerMiscData[] data = BpartnerMiscData.select(this, strBPartner);
String strUserRep = "";
- if (data != null && data.length > 0)
+ if (data != null && data.length > 0) {
strUserRep = SEOrderBPartnerData.userIdSalesRep(this,
data[0].salesrepId);
+ }
+ if (StringUtils.isEmpty(strUserRep)) {
+ strUserRep = vars.getUser();
+ }
StringBuffer resultado = new StringBuffer();
resultado.append("var calloutName='SL_InOut_BPartner';\n\n");
------------------------------------------------------------------------------
Go from Idea to Many App Stores Faster with Intel(R) XDK
Give your users amazing mobile app experiences with Intel(R) XDK.
Use one codebase in this all-in-one HTML5 development environment.
Design, debug & build mobile apps & 2D/3D high-impact games for multiple OSs.
http://pubads.g.doubleclick.net/gampad/clk?id=254741551&iu=/4140
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
