details:   https://code.openbravo.com/erp/devel/pi/rev/fdf6a30ff33d
changeset: 30657:fdf6a30ff33d
user:      Nono Carballo <nonofce <at> gmail.com>
date:      Fri Nov 11 13:00:32 2016 -0500
summary:   Fixes issue 34410: GL item in Open Items section is set read only

If Simple G/L Journal is multi general ledger, the G/L Item in Open Item section
is set read only and it's value is set to G/L Item in the line, this value is
updated when G/L Item value in the line changes.

The display logic of G/L Item in Open Item section takes into account if Multi
General Ledger is set in header. A new callout was made to kep updated it's 
value
when Account values in line changes.

diffstat:

 src-db/database/sourcedata/AD_COLUMN.xml                                |   3 
+-
 src/org/openbravo/erpCommon/ad_callouts/SL_Journal_MultiAcctSchema.java |  16 
++++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diffs (50 lines):

diff -r 7ce6ca92bcbe -r fdf6a30ff33d src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml  Tue Nov 15 16:45:52 2016 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml  Fri Nov 11 13:00:32 2016 -0500
@@ -334852,7 +334852,7 @@
 <!--A05F34CDE306469B8FDD50E315B90421-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--A05F34CDE306469B8FDD50E315B90421-->  
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--A05F34CDE306469B8FDD50E315B90421-->  
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--A05F34CDE306469B8FDD50E315B90421-->  
<READONLYLOGIC><![CDATA[@FIN_Payment_ID@ ! '']]></READONLYLOGIC>
+<!--A05F34CDE306469B8FDD50E315B90421-->  
<READONLYLOGIC><![CDATA[@FIN_Payment_ID@ ! '' | 
@Multi_GL@='Y']]></READONLYLOGIC>
 <!--A05F34CDE306469B8FDD50E315B90421-->  
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--A05F34CDE306469B8FDD50E315B90421-->  <SEQNO><![CDATA[181]]></SEQNO>
 <!--A05F34CDE306469B8FDD50E315B90421-->  
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -373259,6 +373259,7 @@
 <!--ED29FE2E5F634577984183787C4F25DA-->  
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--ED29FE2E5F634577984183787C4F25DA-->  
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--ED29FE2E5F634577984183787C4F25DA-->  
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--ED29FE2E5F634577984183787C4F25DA-->  
<AD_CALLOUT_ID><![CDATA[10AB7D84CE4843C793484850AC161EF8]]></AD_CALLOUT_ID>
 <!--ED29FE2E5F634577984183787C4F25DA-->  
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--ED29FE2E5F634577984183787C4F25DA-->  
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--ED29FE2E5F634577984183787C4F25DA-->  <POSITION><![CDATA[44]]></POSITION>
diff -r 7ce6ca92bcbe -r fdf6a30ff33d 
src/org/openbravo/erpCommon/ad_callouts/SL_Journal_MultiAcctSchema.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Journal_MultiAcctSchema.java   
Tue Nov 15 16:45:52 2016 +0100
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Journal_MultiAcctSchema.java   
Fri Nov 11 13:00:32 2016 -0500
@@ -20,13 +20,23 @@
 
 import javax.servlet.ServletException;
 
+import org.apache.commons.lang.StringUtils;
+
 public class SL_Journal_MultiAcctSchema extends SimpleCallout {
 
   @Override
   protected void execute(CalloutInfo info) throws ServletException {
-    String strMultiGL = info.vars.getStringParameter("inpmultiGl");
-    if ("Y".equals(strMultiGL)) {
-      info.addResult("inpcAcctschemaId", null);
+    final String strMultiGL = info.vars.getStringParameter("inpmultiGl");
+    if (StringUtils.equals(strMultiGL, "Y")) {
+      final String lastFieldChanged = info.getLastFieldChanged();
+
+      if (StringUtils.equals(lastFieldChanged, "inpmultiGl")) {
+        info.addResult("inpcAcctschemaId", null);
+      }
+
+      else if (StringUtils.equals(lastFieldChanged, "inpaccountId")) {
+        info.addResult("inpcGlitemId", 
info.vars.getStringParameter("inpaccountId"));
+      }
     }
   }
 }

------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to