[jira] [Created] (OFBIZ-4610) Add support to save HS Code in Goods Identification
Add support to save HS Code in Goods Identification --- Key: OFBIZ-4610 URL: https://issues.apache.org/jira/browse/OFBIZ-4610 Project: OFBiz Issue Type: Improvement Reporter: Sam Hamilton Priority: Trivial Add support to save the HS Code ( http://en.wikipedia.org/wiki/Harmonized_System ) in the system. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Updated] (OFBIZ-4610) Add support to save HS Code in Goods Identification
[ https://issues.apache.org/jira/browse/OFBIZ-4610?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sam Hamilton updated OFBIZ-4610: Attachment: OFBIZ-4610.patch Add support to save HS Code in Goods Identification --- Key: OFBIZ-4610 URL: https://issues.apache.org/jira/browse/OFBIZ-4610 Project: OFBiz Issue Type: Improvement Reporter: Sam Hamilton Priority: Trivial Attachments: OFBIZ-4610.patch Add support to save the HS Code ( http://en.wikipedia.org/wiki/Harmonized_System ) in the system. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Created] (OFBIZ-4611) Extra screen included in Facility
Extra screen included in Facility -- Key: OFBIZ-4611 URL: https://issues.apache.org/jira/browse/OFBIZ-4611 Project: OFBiz Issue Type: Bug Components: product Reporter: Sam Hamilton Priority: Trivial If you go to https://localhost:8443/facility/control/main then in the bottom of the sub-menu there is a link to an extra section called Tracking which seems to have been introduced when committing OFBIZ-4172. ( http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml?view=diffr1=1195036r2=1195037pathrev=1195037 ) I could not find any other references to this file elsewhere in the history so assuming it was a mistake. Thanks Sam -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Updated] (OFBIZ-4604) French translation correction for ListWorkEffortTimeEntries label
[ https://issues.apache.org/jira/browse/OFBIZ-4604?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Heintz updated OFBIZ-4604: -- Attachment: OFBIZ-4604.patch add a new correction replace Approuvé par la réf. d'utilisateur de connexion by Approuvé par French translation correction for ListWorkEffortTimeEntries label - Key: OFBIZ-4604 URL: https://issues.apache.org/jira/browse/OFBIZ-4604 Project: OFBiz Issue Type: Improvement Components: workeffort Reporter: Olivier Heintz Priority: Minor Attachments: OFBIZ-4604.patch, WorkEffortLabel.patch Previous translation was Planifications horaires de la tâche I propose Détails des temps passés sur la tâche TimeEntries is more used for history not for schedule -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira
Re: Tax calculation for all order adjustments
Firstly, for myself. But I think this solution is useful not only for me, especial for VAT users and if all is ok, it would be grateful to contribute to SVN. The most tricky question for me is what I should do with Tax shipping and Tax promotion in the TaxAuthorityRateProduct? Actually, they will be retired, and should not be used anymore, because all tax rate adjustments will be setup in a separate tab. - Kind regards, Sergei -- View this message in context: http://ofbiz.135035.n4.nabble.com/Tax-calculation-for-all-order-adjustments-tp4153757p4163677.html Sent from the OFBiz - Dev mailing list archive at Nabble.com.
[jira] [Created] (OFBIZ-4612) apache tika jars are out of date.
apache tika jars are out of date. - Key: OFBIZ-4612 URL: https://issues.apache.org/jira/browse/OFBIZ-4612 Project: OFBiz Issue Type: Improvement Components: framework Affects Versions: SVN trunk Reporter: Wai http://tika.apache.org latest jar is 1.0, trunk ofbiz uses 0.9 Note: ofbiz uses 2 tika related jars (ie../applications/content/lib/tika-core-0.9.jar ./applications/content/lib/tika-parsers-0.9.jar) but latest version contains only one jar. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira
Re: Tax calculation for all order adjustments
Thanks. I am trying to pinpoint how to approach this. If your doing it for yourself then you have more latitude not to take into considerations like the US Tax authority. The next consideration is when you upgrade you will have to make sure your changes are not overwritten with the SVN image. If you plan to submit a patch then the design has to be reviewed to make sure it does not effect other Tax authority uses. You also have a migration to setup for productions systems. biletnikov sent the following on 12/5/2011 10:35 PM: Firstly, for myself. But I think this solution is useful not only for me, especial for VAT users and if all is ok, it would be grateful to contribute to SVN. The most tricky question for me is what I should do with Tax shipping and Tax promotion in the TaxAuthorityRateProduct? Actually, they will be retired, and should not be used anymore, because all tax rate adjustments will be setup in a separate tab. - Kind regards, Sergei -- View this message in context: http://ofbiz.135035.n4.nabble.com/Tax-calculation-for-all-order-adjustments-tp4153757p4163677.html Sent from the OFBiz - Dev mailing list archive at Nabble.com.
buildbot failure in ASF Buildbot on ofbiz-trunk
The Buildbot has detected a new failure on builder ofbiz-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/ofbiz-trunk/builds/2381 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: isis_ubuntu Build Reason: scheduler Build Source Stamp: [branch ofbiz/trunk] 1211073 Blamelist: jaz BUILD FAILED: failed compile sincerely, -The Buildbot
Re: svn commit: r1211073 - in /ofbiz/trunk: applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java framework/common/src/org/ofbiz/common/CommonServices.java framework
Please revert this. It does not compile on Sun/Oracle JDK.
-Adrian
On 12/6/2011 7:51 PM, j...@apache.org wrote:
Author: jaz
Date: Tue Dec 6 19:51:28 2011
New Revision: 1211073
URL: http://svn.apache.org/viewvc?rev=1211073view=rev
Log:
few minor changes to fix compiling with openjdk icetea6 1.7.9
Modified:
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java
ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java
ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java
Modified:
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java?rev=1211073r1=1211072r2=1211073view=diff
==
---
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java
(original)
+++
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java
Tue Dec 6 19:51:28 2011
@@ -399,7 +399,7 @@ public class WorldPayEvents {
// attempt to release the offline hold on the order (workflow)
OrderChangeHelper.releaseInitialOrderHold(dispatcher, orderId);
// call the email confirm service
-MapString, String emailContext = UtilMisc.toMap(orderId, orderId,
userLogin, userLogin);
+MapString, Object emailContext = UtilMisc.toMap(orderId, orderId,
userLogin, userLogin);
try {
dispatcher.runSync(sendOrderConfirmation, emailContext);
} catch (GenericServiceException e) {
Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java?rev=1211073r1=1211072r2=1211073view=diff
==
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java
(original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java Tue
Dec 6 19:51:28 2011
@@ -184,7 +184,7 @@ public class CommonServices {
partyId = userLogin.getString(partyId);
}
-MapString, String fields = UtilMisc.toMap(noteId, noteId, noteName,
noteName, noteInfo, note,
+MapString, Object fields = UtilMisc.toMap(noteId, noteId, noteName,
noteName, noteInfo, note,
noteParty, partyId, noteDateTime, noteDate);
try {
Modified:
ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java?rev=1211073r1=1211072r2=1211073view=diff
==
--- ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java
(original)
+++ ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java
Tue Dec 6 19:51:28 2011
@@ -49,7 +49,7 @@ public class OFBizSecurity implements Se
protected Delegator delegator = null;
-protected static final MapString, MapString, String simpleRoleEntity
= UtilMisc.toMap(
+protected static final MapString, MapString, Object simpleRoleEntity
= UtilMisc.toMap(
ORDERMGR, UtilMisc.toMap(name, OrderRole, pkey, orderId),
FACILITY, UtilMisc.toMap(name, FacilityParty, pkey,
facilityId),
MARKETING, UtilMisc.toMap(name, MarketingCampaignRole, pkey,
marketingCampaignId));
@@ -208,10 +208,10 @@ public class OFBizSecurity implements Se
if (hasEntityPermission(application + _ROLE, action,
userLogin)) return true;
}
-MapString, String simpleRoleMap =
OFBizSecurity.simpleRoleEntity.get(application);
+MapString, Object simpleRoleMap =
OFBizSecurity.simpleRoleEntity.get(application);
if (simpleRoleMap != null roles != null) {
-entityName = simpleRoleMap.get(name);
-String pkey = simpleRoleMap.get(pkey);
+entityName = (String) simpleRoleMap.get(name);
+String pkey = (String) simpleRoleMap.get(pkey);
if (pkey != null) {
ListEntityExpr expressions = new ArrayListEntityExpr();
for (String role: roles) {
buildbot success in ASF Buildbot on ofbiz-trunk
The Buildbot has detected a restored build on builder ofbiz-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/ofbiz-trunk/builds/2382 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: isis_ubuntu Build Reason: scheduler Build Source Stamp: [branch ofbiz/trunk] 1211088 Blamelist: jaz Build succeeded! sincerely, -The Buildbot
Re: svn commit: r1211073 - in /ofbiz/trunk: applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java framework/common/src/org/ofbiz/common/CommonServices.java framework
Yeah, I noticed that right after I checked it in. Its been reverted.
Andrew
On Dec 6, 2011, at 3:25 PM, Adrian Crum wrote:
Please revert this. It does not compile on Sun/Oracle JDK.
-Adrian
On 12/6/2011 7:51 PM, j...@apache.org wrote:
Author: jaz
Date: Tue Dec 6 19:51:28 2011
New Revision: 1211073
URL: http://svn.apache.org/viewvc?rev=1211073view=rev
Log:
few minor changes to fix compiling with openjdk icetea6 1.7.9
Modified:
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java
ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java
ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java
Modified:
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java?rev=1211073r1=1211072r2=1211073view=diff
==
---
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java
(original)
+++
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java
Tue Dec 6 19:51:28 2011
@@ -399,7 +399,7 @@ public class WorldPayEvents {
// attempt to release the offline hold on the order (workflow)
OrderChangeHelper.releaseInitialOrderHold(dispatcher, orderId);
// call the email confirm service
-MapString, String emailContext = UtilMisc.toMap(orderId,
orderId, userLogin, userLogin);
+MapString, Object emailContext = UtilMisc.toMap(orderId,
orderId, userLogin, userLogin);
try {
dispatcher.runSync(sendOrderConfirmation, emailContext);
} catch (GenericServiceException e) {
Modified:
ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java?rev=1211073r1=1211072r2=1211073view=diff
==
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java
(original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java
Tue Dec 6 19:51:28 2011
@@ -184,7 +184,7 @@ public class CommonServices {
partyId = userLogin.getString(partyId);
}
-MapString, String fields = UtilMisc.toMap(noteId, noteId,
noteName, noteName, noteInfo, note,
+MapString, Object fields = UtilMisc.toMap(noteId, noteId,
noteName, noteName, noteInfo, note,
noteParty, partyId, noteDateTime, noteDate);
try {
Modified:
ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java?rev=1211073r1=1211072r2=1211073view=diff
==
--- ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java
(original)
+++ ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java
Tue Dec 6 19:51:28 2011
@@ -49,7 +49,7 @@ public class OFBizSecurity implements Se
protected Delegator delegator = null;
-protected static final MapString, MapString, String
simpleRoleEntity = UtilMisc.toMap(
+protected static final MapString, MapString, Object
simpleRoleEntity = UtilMisc.toMap(
ORDERMGR, UtilMisc.toMap(name, OrderRole, pkey, orderId),
FACILITY, UtilMisc.toMap(name, FacilityParty, pkey,
facilityId),
MARKETING, UtilMisc.toMap(name, MarketingCampaignRole,
pkey, marketingCampaignId));
@@ -208,10 +208,10 @@ public class OFBizSecurity implements Se
if (hasEntityPermission(application + _ROLE, action,
userLogin)) return true;
}
-MapString, String simpleRoleMap =
OFBizSecurity.simpleRoleEntity.get(application);
+MapString, Object simpleRoleMap =
OFBizSecurity.simpleRoleEntity.get(application);
if (simpleRoleMap != null roles != null) {
-entityName = simpleRoleMap.get(name);
-String pkey = simpleRoleMap.get(pkey);
+entityName = (String) simpleRoleMap.get(name);
+String pkey = (String) simpleRoleMap.get(pkey);
if (pkey != null) {
ListEntityExpr expressions = new ArrayListEntityExpr();
for (String role: roles) {
[jira] [Commented] (OFBIZ-4611) Extra screen included in Facility
[ https://issues.apache.org/jira/browse/OFBIZ-4611?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13163883#comment-13163883 ] Gaudin Pierre commented on OFBIZ-4611: -- Hi sam This part was not published yet. It show the traceability downstream and upstream for a lot id. Pierre Extra screen included in Facility -- Key: OFBIZ-4611 URL: https://issues.apache.org/jira/browse/OFBIZ-4611 Project: OFBiz Issue Type: Bug Components: product Reporter: Sam Hamilton Priority: Trivial If you go to https://localhost:8443/facility/control/main then in the bottom of the sub-menu there is a link to an extra section called Tracking which seems to have been introduced when committing OFBIZ-4172. ( http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml?view=diffr1=1195036r2=1195037pathrev=1195037 ) I could not find any other references to this file elsewhere in the history so assuming it was a mistake. Thanks Sam -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira
Re: Tax calculation for all order adjustments
You could introduce a properties setting: OrderAdjustMentTaxSettingAll=true/false false: as is now: only promotion shipping according TaxAuthorityRateProduct true: tax on all order adjustments: ignore TaxAuthorityRateProduct Show this setting on the TaxAuthorityRateProduct screen or do not allow setting there so everybody happy Regards, Hans On 12/06/2011 01:35 PM, biletnikov wrote: Firstly, for myself. But I think this solution is useful not only for me, especial for VAT users and if all is ok, it would be grateful to contribute to SVN. The most tricky question for me is what I should do with Tax shipping and Tax promotion in the TaxAuthorityRateProduct? Actually, they will be retired, and should not be used anymore, because all tax rate adjustments will be setup in a separate tab. - Kind regards, Sergei -- View this message in context: http://ofbiz.135035.n4.nabble.com/Tax-calculation-for-all-order-adjustments-tp4153757p4163677.html Sent from the OFBiz - Dev mailing list archive at Nabble.com.
[jira] [Commented] (OFBIZ-4611) Extra screen included in Facility
[ https://issues.apache.org/jira/browse/OFBIZ-4611?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13164178#comment-13164178 ] Sam Hamilton commented on OFBIZ-4611: - Hi Pierre, Sorry what do you mean not published yet - its not finished and you didn't add it to the patch for OFBIZ-4172? If thats the case we need to remove the extra menu item as its not working. Thanks Sam Extra screen included in Facility -- Key: OFBIZ-4611 URL: https://issues.apache.org/jira/browse/OFBIZ-4611 Project: OFBiz Issue Type: Bug Components: product Reporter: Sam Hamilton Priority: Trivial If you go to https://localhost:8443/facility/control/main then in the bottom of the sub-menu there is a link to an extra section called Tracking which seems to have been introduced when committing OFBIZ-4172. ( http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml?view=diffr1=1195036r2=1195037pathrev=1195037 ) I could not find any other references to this file elsewhere in the history so assuming it was a mistake. Thanks Sam -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira
Re: svn commit: r1211073 - in /ofbiz/trunk: applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java framework/common/src/org/ofbiz/common/CommonServices.java framework
Hi Andrew,
Since we encountered an issue with the previous JDK version we used in December 2010 on demo server, we have forced to a more recent
version then. I will try to see if using a newer version now works with your changes. Anyway we need to get ahead with JDK on demo
server.
Cheers
Jacques
From: Andrew Zeneski and...@andrewzeneski.com
Yeah, I noticed that right after I checked it in. Its been reverted.
Andrew
On Dec 6, 2011, at 3:25 PM, Adrian Crum wrote:
Please revert this. It does not compile on Sun/Oracle JDK.
-Adrian
On 12/6/2011 7:51 PM, j...@apache.org wrote:
Author: jaz
Date: Tue Dec 6 19:51:28 2011
New Revision: 1211073
URL: http://svn.apache.org/viewvc?rev=1211073view=rev
Log:
few minor changes to fix compiling with openjdk icetea6 1.7.9
Modified:
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java
ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java
ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java
Modified:
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java?rev=1211073r1=1211072r2=1211073view=diff
==
---
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java
(original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java Tue Dec 6 19:51:28
2011
@@ -399,7 +399,7 @@ public class WorldPayEvents {
// attempt to release the offline hold on the order (workflow)
OrderChangeHelper.releaseInitialOrderHold(dispatcher, orderId);
// call the email confirm service
-MapString, String emailContext = UtilMisc.toMap(orderId, orderId,
userLogin, userLogin);
+MapString, Object emailContext = UtilMisc.toMap(orderId, orderId,
userLogin, userLogin);
try {
dispatcher.runSync(sendOrderConfirmation, emailContext);
} catch (GenericServiceException e) {
Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java?rev=1211073r1=1211072r2=1211073view=diff
==
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java
(original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java Tue
Dec 6 19:51:28 2011
@@ -184,7 +184,7 @@ public class CommonServices {
partyId = userLogin.getString(partyId);
}
-MapString, String fields = UtilMisc.toMap(noteId, noteId, noteName,
noteName, noteInfo, note,
+MapString, Object fields = UtilMisc.toMap(noteId, noteId, noteName,
noteName, noteInfo, note,
noteParty, partyId, noteDateTime, noteDate);
try {
Modified:
ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java?rev=1211073r1=1211072r2=1211073view=diff
==
--- ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java
(original)
+++ ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java
Tue Dec 6 19:51:28 2011
@@ -49,7 +49,7 @@ public class OFBizSecurity implements Se
protected Delegator delegator = null;
-protected static final MapString, MapString, String simpleRoleEntity
= UtilMisc.toMap(
+protected static final MapString, MapString, Object simpleRoleEntity
= UtilMisc.toMap(
ORDERMGR, UtilMisc.toMap(name, OrderRole, pkey, orderId),
FACILITY, UtilMisc.toMap(name, FacilityParty, pkey,
facilityId),
MARKETING, UtilMisc.toMap(name, MarketingCampaignRole, pkey,
marketingCampaignId));
@@ -208,10 +208,10 @@ public class OFBizSecurity implements Se
if (hasEntityPermission(application + _ROLE, action, userLogin))
return true;
}
-MapString, String simpleRoleMap =
OFBizSecurity.simpleRoleEntity.get(application);
+MapString, Object simpleRoleMap =
OFBizSecurity.simpleRoleEntity.get(application);
if (simpleRoleMap != null roles != null) {
-entityName = simpleRoleMap.get(name);
-String pkey = simpleRoleMap.get(pkey);
+entityName = (String) simpleRoleMap.get(name);
+String pkey = (String) simpleRoleMap.get(pkey);
if (pkey != null) {
ListEntityExpr expressions = new ArrayListEntityExpr();
for (String role: roles) {
