Merge pull request #1911 from SusanneCalderon/feature/Issue1658_HRLis…

…tDataAccessAll #1658 Change data access level of tables HR_ListType, HR_List, HR_ListVersion and HR_ListLine to ALL
adempiere · Oct 1, 2018 · 8794c49 · 8794c49
2 parents d7f9319 + 9061fdd
commit 8794c49
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/migration/390lts-391/04000_1658_PayrollList_DataAccessLevel_ALL.xml b/migration/390lts-391/04000_1658_PayrollList_DataAccessLevel_ALL.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<Migrations>
+  <Migration EntityType="D" Name="1658_Payroll_List_accessible_allclients" ReleaseNo="3.9.1" SeqNo="4000">
+    <Comments>https://github.com/adempiere/adempiere/issues/1658</Comments>
+    <Step SeqNo="20" StepType="AD">
+      <PO AD_Table_ID="100" Action="U" Record_ID="53099" Table="AD_Table">
+        <Data AD_Column_ID="354" Column="AccessLevel" oldValue="3">7</Data>
+      </PO>
+    </Step>
+    <Step SeqNo="30" StepType="AD">
+      <PO AD_Table_ID="100" Action="U" Record_ID="53101" Table="AD_Table">
+        <Data AD_Column_ID="354" Column="AccessLevel" oldValue="3">7</Data>
+      </PO>
+    </Step>
+    <Step SeqNo="40" StepType="AD">
+      <PO AD_Table_ID="100" Action="U" Record_ID="53098" Table="AD_Table">
+        <Data AD_Column_ID="354" Column="AccessLevel" oldValue="3">7</Data>
+      </PO>
+    </Step>
+    <Step SeqNo="50" StepType="AD">
+      <PO AD_Table_ID="100" Action="U" Record_ID="53100" Table="AD_Table">
+        <Data AD_Column_ID="354" Column="AccessLevel" oldValue="3">7</Data>
+      </PO>
+    </Step>
+  </Migration>
+</Migrations>
diff --git a/org.eevolution.hr_and_payroll/src/main/java/base/org/eevolution/model/MHRProcess.java b/org.eevolution.hr_and_payroll/src/main/java/base/org/eevolution/model/MHRProcess.java
@@ -1649,9 +1649,10 @@ public double getList (String listSearchKey,Timestamp from, double amount, Strin
 				"INNER JOIN HR_ListVersion lv ON (lv.HR_List_ID=l.HR_List_ID) " +
 				"INNER JOIN HR_ListLine ll ON (ll.HR_ListVersion_ID=lv.HR_ListVersion_ID) " +
 				"WHERE l.IsActive='Y' AND lv.IsActive='Y' AND ll.IsActive='Y' AND l.Value = ? AND " +
-				"l.AD_Client_ID = ? AND " +
+				"l.AD_Client_ID in (?,0) AND " +
 				"(? BETWEEN lv.ValidFrom AND lv.ValidTo ) AND " +
-				"(? BETWEEN ll.MinValue AND	ll.MaxValue)";
+				"(? BETWEEN ll.MinValue AND	ll.MaxValue)" +
+				" ORDER BY l.AD_CLIENT_ID desc ";
 			params.add(listSearchKey);
 			params.add(getAD_Client_ID());
 			params.add(from);