svn commit: r804935 [4/4] - in /ofbiz/trunk: applications/accounting/ applications/accounting/src/or
Locked
svn commit: r804935 [4/4] - in /ofbiz/trunk: applications/accounting/ applications/accounting/src/or
 
|
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl Mon Aug 17 11:01:25 2009 @@ -106,7 +106,7 @@ <div> <a href="<@ofbizUrl>clearSearchOptionsHistoryList</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderClearSearchHistory}</a> - ${uiLabelMap.OrderClearSearchHistoryNote} + ${uiLabelMap.OrderClearSearchHistoryNote} </div> <#list searchOptionsHistoryList as searchOptions> <#-- searchOptions type is ProductSearchSession.ProductSearchOptions --> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl Mon Aug 17 11:01:25 2009 @@ -236,25 +236,25 @@ } <#if product.virtualVariantMethodEnum?if_exists == "VV_FEATURETREE" && featureLists?has_content> - function checkRadioButton() { - var block1 = document.getElementById("addCart1"); - var block2 = document.getElementById("addCart2"); - <#list featureLists as featureList> - <#list featureList as feature> - <#if feature_index == 0> - var myList = document.getElementById("FT${feature.productFeatureTypeId}"); - if (myList.options[0].selected == true){ - block1.style.display = "none"; - block2.style.display = "block"; - return; - } - <#break> - </#if> - </#list> - </#list> - block1.style.display = "block"; - block2.style.display = "none"; - } + function checkRadioButton() { + var block1 = document.getElementById("addCart1"); + var block2 = document.getElementById("addCart2"); + <#list featureLists as featureList> + <#list featureList as feature> + <#if feature_index == 0> + var myList = document.getElementById("FT${feature.productFeatureTypeId}"); + if (myList.options[0].selected == true){ + block1.style.display = "none"; + block2.style.display = "block"; + return; + } + <#break> + </#if> + </#list> + </#list> + block1.style.display = "block"; + block2.style.display = "none"; + } </#if> //--> </script> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl Mon Aug 17 11:01:25 2009 @@ -21,33 +21,33 @@ <#if forumMessage.caContentAssocTypeId == "RESPONSE"> <#assign threadContentId = forumMessage.ownerContentId?if_exists/> </#if> - <#if rsp?exists> - <#assign contentId = rsp.contentId> - <#else> - <#assign contentId = forumMessage.contentId> - </#if> - <div class="tableheadtext"> - ${uiLabelMap.CommonTitle}: ${forumMessage.contentName?if_exists} ${uiLabelMap.CommonBy}:${forumMessage.createdByUserLogin?if_exists} ${uiLabelMap.CommonAt}: ${forumMessage.createdDate?if_exists.toString().substring(0,16)} - <a href="ViewForumMessage?forumId=${parameters.forumId}&responseContentId=${forumMessage.contentId}&threadContentId=${threadContentId?if_exists}" class="buttontext">${uiLabelMap.CommonView}</a> - </div> - <div class="tableheadtext"> - ${forumMessage.description?if_exists} - </div> - - <#-- - <#assign result = dispatcher.runSync("getPublicForumMessage", Static["org.ofbiz.base.util.UtilMisc"].toMap("contentId", contentId, "userLogin", userLogin))/> - <#if (result.resultData)?exists> - <div class="tableheadtext"> - ${uiLabelMap.CommonTitle}: ${result.resultData.content.description?if_exists} ${uiLabelMap.CommonBy}:${result.resultData.content.createdByUserLogin} ${uiLabelMap.CommonAt}: ${result.resultData.content.createdDate.toString().substring(0,16)} - <a href="addForumMessage?forumId=${parameters.forumId}&forumMessageIdTo=${result.resultData.content.contentId}&threadView=${parameters.threadView?if_exists}" class="buttontext">${uiLabelMap.PartyReply}</a> - </div> - <div class="tabletext"> - <#if result.resultData.electronicText?exists> - ${result.resultData.electronicText.textData} - </#if> - </div> - <hr/> - <#else> - <div class="tabletext"> ${result.errorMessage?if_exists}</div> - </#if> - --> + <#if rsp?exists> + <#assign contentId = rsp.contentId> + <#else> + <#assign contentId = forumMessage.contentId> + </#if> + <div class="tableheadtext"> + ${uiLabelMap.CommonTitle}: ${forumMessage.contentName?if_exists} ${uiLabelMap.CommonBy}:${forumMessage.createdByUserLogin?if_exists} ${uiLabelMap.CommonAt}: ${forumMessage.createdDate?if_exists.toString().substring(0,16)} + <a href="ViewForumMessage?forumId=${parameters.forumId}&responseContentId=${forumMessage.contentId}&threadContentId=${threadContentId?if_exists}" class="buttontext">${uiLabelMap.CommonView}</a> + </div> + <div class="tableheadtext"> + ${forumMessage.description?if_exists} + </div> + + <#-- + <#assign result = dispatcher.runSync("getPublicForumMessage", Static["org.ofbiz.base.util.UtilMisc"].toMap("contentId", contentId, "userLogin", userLogin))/> + <#if (result.resultData)?exists> + <div class="tableheadtext"> + ${uiLabelMap.CommonTitle}: ${result.resultData.content.description?if_exists} ${uiLabelMap.CommonBy}:${result.resultData.content.createdByUserLogin} ${uiLabelMap.CommonAt}: ${result.resultData.content.createdDate.toString().substring(0,16)} + <a href="addForumMessage?forumId=${parameters.forumId}&forumMessageIdTo=${result.resultData.content.contentId}&threadView=${parameters.threadView?if_exists}" class="buttontext">${uiLabelMap.PartyReply}</a> + </div> + <div class="tabletext"> + <#if result.resultData.electronicText?exists> + ${result.resultData.electronicText.textData} + </#if> + </div> + <hr/> + <#else> + <div class="tabletext"> ${result.errorMessage?if_exists}</div> + </#if> + --> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showforum.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showforum.ftl?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showforum.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showforum.ftl Mon Aug 17 11:01:25 2009 @@ -18,5 +18,5 @@ --> <#list forumMessages?if_exists as forumMessage> - <#include "messageDisplay.ftl"> + <#include "messageDisplay.ftl"> </#list> Modified: ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java (original) +++ ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java Mon Aug 17 11:01:25 2009 @@ -354,30 +354,30 @@ } } - protected String[] getPartyInfo(Address shipAddr, Address billAddr) throws GeneralException { - String shipCmId = null; - String billCmId = null; - String partyId = null; - - // look for an existing shipping address - List<GenericValue> shipInfo = PartyWorker.findMatchingPartyAndPostalAddress(delegator, shipAddr.getAddress1(), - (UtilValidate.isEmpty(shipAddr.getAddress2()) ? null : shipAddr.getAddress2()), shipAddr.getCity(), shipAddr.getRegion(), - shipAddr.getPostalCode(), null, getCountryGeoId(shipAddr.getCountryCode()), shipAddr.getStructuredName().getFirstName(), - null, shipAddr.getStructuredName().getLastName()); - - if (shipInfo != null && shipInfo.size() > 0) { - GenericValue first = EntityUtil.getFirst(shipInfo); - shipCmId = first.getString("contactMechId"); - partyId = first.getString("partyId"); - Debug.logInfo("Existing shipping address found : " + shipCmId + " (party: " + partyId + ")", module); - } - - // look for an existing billing address - List<GenericValue> billInfo = PartyWorker.findMatchingPartyAndPostalAddress(delegator, billAddr.getAddress1(), - (UtilValidate.isEmpty(billAddr.getAddress2()) ? null : billAddr.getAddress2()), billAddr.getCity(), billAddr.getRegion(), - billAddr.getPostalCode(), null, getCountryGeoId(billAddr.getCountryCode()), billAddr.getStructuredName().getFirstName(), - null, billAddr.getStructuredName().getLastName()); - + protected String[] getPartyInfo(Address shipAddr, Address billAddr) throws GeneralException { + String shipCmId = null; + String billCmId = null; + String partyId = null; + + // look for an existing shipping address + List<GenericValue> shipInfo = PartyWorker.findMatchingPartyAndPostalAddress(delegator, shipAddr.getAddress1(), + (UtilValidate.isEmpty(shipAddr.getAddress2()) ? null : shipAddr.getAddress2()), shipAddr.getCity(), shipAddr.getRegion(), + shipAddr.getPostalCode(), null, getCountryGeoId(shipAddr.getCountryCode()), shipAddr.getStructuredName().getFirstName(), + null, shipAddr.getStructuredName().getLastName()); + + if (shipInfo != null && shipInfo.size() > 0) { + GenericValue first = EntityUtil.getFirst(shipInfo); + shipCmId = first.getString("contactMechId"); + partyId = first.getString("partyId"); + Debug.logInfo("Existing shipping address found : " + shipCmId + " (party: " + partyId + ")", module); + } + + // look for an existing billing address + List<GenericValue> billInfo = PartyWorker.findMatchingPartyAndPostalAddress(delegator, billAddr.getAddress1(), + (UtilValidate.isEmpty(billAddr.getAddress2()) ? null : billAddr.getAddress2()), billAddr.getCity(), billAddr.getRegion(), + billAddr.getPostalCode(), null, getCountryGeoId(billAddr.getCountryCode()), billAddr.getStructuredName().getFirstName(), + null, billAddr.getStructuredName().getLastName()); + if (billInfo != null && billInfo.size() > 0) { GenericValue first = EntityUtil.getFirst(billInfo); billCmId = first.getString("contactMechId"); @@ -421,11 +421,11 @@ } } - return new String[] { partyId, shipCmId, billCmId }; - } + return new String[] { partyId, shipCmId, billCmId }; + } - protected String createPerson(StructuredName name) throws GeneralException { - Map<String, Object> personMap = FastMap.newInstance(); + protected String createPerson(StructuredName name) throws GeneralException { + Map<String, Object> personMap = FastMap.newInstance(); personMap.put("firstName", name.getFirstName()); personMap.put("lastName", name.getLastName()); personMap.put("userLogin", system); @@ -437,10 +437,10 @@ String partyId = (String) personResp.get("partyId"); Debug.logInfo("New party created : " + partyId, module); - return partyId; - } - - protected String createPartyAddress(String partyId, Address addr) throws GeneralException { + return partyId; + } + + protected String createPartyAddress(String partyId, Address addr) throws GeneralException { // check for zip+4 String postalCode = addr.getPostalCode(); String postalCodeExt = null; @@ -474,33 +474,33 @@ String contactMechId = (String) addrResp.get("contactMechId"); Debug.logInfo("Created new address for partyId [" + partyId + "] :" + contactMechId, module); - return contactMechId; - } - - protected void addPurposeToAddress(String partyId, String contactMechId, int addrType) throws GeneralException { - // convert the int to a purpose type ID - String contactMechPurposeTypeId = getAddressType(addrType); - - // check to make sure the purpose doesn't already exist - List<GenericValue> values = delegator.findByAnd("PartyContactMechPurpose", UtilMisc.toMap("partyId", partyId, - "contactMechId", contactMechId, "contactMechPurposeTypeId", contactMechPurposeTypeId)); - - if (values == null || values.size() == 0) { - Map<String, Object> addPurposeMap = FastMap.newInstance(); - addPurposeMap.put("contactMechId", contactMechId); - addPurposeMap.put("partyId", partyId); - addPurposeMap.put("contactMechPurposeTypeId", contactMechPurposeTypeId); - addPurposeMap.put("userLogin", system); - - Map<String, Object> addPurposeResp = dispatcher.runSync("createPartyContactMechPurpose", addPurposeMap); - if (addPurposeResp != null && ServiceUtil.isError(addPurposeResp)) { - throw new GeneralException(ServiceUtil.getErrorMessage(addPurposeResp)); - } - } - } - - protected String getAddressType(int addrType) { - String contactMechPurposeTypeId = "GENERAL_LOCATION"; + return contactMechId; + } + + protected void addPurposeToAddress(String partyId, String contactMechId, int addrType) throws GeneralException { + // convert the int to a purpose type ID + String contactMechPurposeTypeId = getAddressType(addrType); + + // check to make sure the purpose doesn't already exist + List<GenericValue> values = delegator.findByAnd("PartyContactMechPurpose", UtilMisc.toMap("partyId", partyId, + "contactMechId", contactMechId, "contactMechPurposeTypeId", contactMechPurposeTypeId)); + + if (values == null || values.size() == 0) { + Map<String, Object> addPurposeMap = FastMap.newInstance(); + addPurposeMap.put("contactMechId", contactMechId); + addPurposeMap.put("partyId", partyId); + addPurposeMap.put("contactMechPurposeTypeId", contactMechPurposeTypeId); + addPurposeMap.put("userLogin", system); + + Map<String, Object> addPurposeResp = dispatcher.runSync("createPartyContactMechPurpose", addPurposeMap); + if (addPurposeResp != null && ServiceUtil.isError(addPurposeResp)) { + throw new GeneralException(ServiceUtil.getErrorMessage(addPurposeResp)); + } + } + } + + protected String getAddressType(int addrType) { + String contactMechPurposeTypeId = "GENERAL_LOCATION"; switch (addrType) { case SHIPPING_ADDRESS: contactMechPurposeTypeId = "SHIPPING_LOCATION"; @@ -510,9 +510,9 @@ break; } return contactMechPurposeTypeId; - } - - protected void setContactInfo(ShoppingCart cart, String contactMechPurposeTypeId, String infoString) throws GeneralException { + } + + protected void setContactInfo(ShoppingCart cart, String contactMechPurposeTypeId, String infoString) throws GeneralException { Map<String, Object> lookupMap = FastMap.newInstance(); String cmId = null; @@ -576,11 +576,11 @@ cart.addContactMech(contactMechPurposeTypeId, cmId); } } - - protected String getCountryGeoId(String geoCode) { - if (geoCode != null && geoCode.length() == 3) { - return geoCode; - } + + protected String getCountryGeoId(String geoCode) { + if (geoCode != null && geoCode.length() == 3) { + return geoCode; + } List<GenericValue> geos = null; try { geos = delegator.findByAnd("Geo", UtilMisc.toMap("geoCode", geoCode, "geoTypeId", "COUNTRY")); @@ -593,17 +593,17 @@ return "_NA_"; } } - - protected boolean hasHoldOrderNotes(String orderId) { - EntityCondition idCond = EntityCondition.makeCondition("orderId", EntityOperator.EQUALS, orderId); - EntityCondition content = EntityCondition.makeCondition("noteInfo", EntityOperator.LIKE, "%Order is held%"); - EntityCondition mainCond = EntityCondition.makeCondition(UtilMisc.toList(idCond, content), EntityOperator.AND); - List<GenericValue> holdOrderNotes = null; - try { - holdOrderNotes = delegator.findList("OrderHeaderNoteView", mainCond, null, null, null, false); - } catch (GenericEntityException e) { - Debug.logError(e, module); - } - return UtilValidate.isNotEmpty(holdOrderNotes); - } + + protected boolean hasHoldOrderNotes(String orderId) { + EntityCondition idCond = EntityCondition.makeCondition("orderId", EntityOperator.EQUALS, orderId); + EntityCondition content = EntityCondition.makeCondition("noteInfo", EntityOperator.LIKE, "%Order is held%"); + EntityCondition mainCond = EntityCondition.makeCondition(UtilMisc.toList(idCond, content), EntityOperator.AND); + List<GenericValue> holdOrderNotes = null; + try { + holdOrderNotes = delegator.findList("OrderHeaderNoteView", mainCond, null, null, null, false); + } catch (GenericEntityException e) { + Debug.logError(e, module); + } + return UtilValidate.isNotEmpty(holdOrderNotes); + } } \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl (original) +++ ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl Mon Aug 17 11:01:25 2009 @@ -32,9 +32,9 @@ <#assign shipmentNotesSize = 65/> <n:PROCESS_SHIPMENT_001 xmlns:n="http://www.openapplications.org/161B_PROCESS_SHIPMENT_001" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:os="http://www.openapplications.org/oagis_segments" - xmlns:of="http://www.openapplications.org/oagis_fields"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:os="http://www.openapplications.org/oagis_segments" + xmlns:of="http://www.openapplications.org/oagis_fields"> <os:CNTROLAREA> <os:BSR> <of:VERB>PROCESS</of:VERB> Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy Mon Aug 17 11:01:25 2009 @@ -46,7 +46,7 @@ if (timesheets) { timesheet = timesheets[0]; } else { - result = dispatcher.runSync("createProjectTimesheet", ["userLogin" : parameters.userLogin, "partyId" : partyId]); + result = dispatcher.runSync("createProjectTimesheet", ["userLogin" : parameters.userLogin, "partyId" : partyId]); if (result && result.timesheetId) { timesheet = delegator.findByPrimaryKey("Timesheet", ["timesheetId" : result.timesheetId]); } Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListCurrentProjects.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListCurrentProjects.groovy?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListCurrentProjects.groovy (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListCurrentProjects.groovy Mon Aug 17 11:01:25 2009 @@ -28,13 +28,13 @@ projects = []; allProjects.each { project -> result = dispatcher.runSync("getProject", ["userLogin" : parameters.userLogin, "projectId" : project.workEffortId]); - if (result.projectInfo) { - resultAssign = delegator.findByAnd("WorkEffortPartyAssignment", ["partyId" : parameters.userLogin.partyId, "workEffortId" : project.workEffortId]) - if (security.hasEntityPermission("PROJECTMGR", "_ADMIN", session) - || ((security.hasEntityPermission("PROJECTMGR", "_ROLE_ADMIN", session) || security.hasEntityPermission("PROJECTMGR", "_ROLE_VIEW", session)) && resultAssign)) { - projects.add(result.projectInfo); - } - } + if (result.projectInfo) { + resultAssign = delegator.findByAnd("WorkEffortPartyAssignment", ["partyId" : parameters.userLogin.partyId, "workEffortId" : project.workEffortId]) + if (security.hasEntityPermission("PROJECTMGR", "_ADMIN", session) + || ((security.hasEntityPermission("PROJECTMGR", "_ROLE_ADMIN", session) || security.hasEntityPermission("PROJECTMGR", "_ROLE_VIEW", session)) && resultAssign)) { + projects.add(result.projectInfo); + } + } } if (projects) { context.projects = projects; Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectIsBillable.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectIsBillable.groovy?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectIsBillable.groovy (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectIsBillable.groovy Mon Aug 17 11:01:25 2009 @@ -25,17 +25,17 @@ toPartyId = null; fromPartyId = null; projectMembers.each {member -> - if (member.roleTypeId.equals("INTERNAL_ORGANIZATIO")) { - fromPartyId = member.partyId; - } - if (member.roleTypeId.equals("CLIENT_BILLING")) { - toPartyId = member.partyId; - } - if (fromPartyId && toPartyId && fromPartyId.equals(toPartyId)) { - context.isBillable = false; - } else if (!toPartyId || !fromPartyId){ + if (member.roleTypeId.equals("INTERNAL_ORGANIZATIO")) { + fromPartyId = member.partyId; + } + if (member.roleTypeId.equals("CLIENT_BILLING")) { + toPartyId = member.partyId; + } + if (fromPartyId && toPartyId && fromPartyId.equals(toPartyId)) { context.isBillable = false; - } else { - context.isBillable = true; - } + } else if (!toPartyId || !fromPartyId){ + context.isBillable = false; + } else { + context.isBillable = true; + } } Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getLastRequestAssignment.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getLastRequestAssignment.groovy?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getLastRequestAssignment.groovy (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getLastRequestAssignment.groovy Mon Aug 17 11:01:25 2009 @@ -24,16 +24,16 @@ custRequestList = delegator.findByAnd("CustRequest", ["fromPartyId" : fromPartyId], ["-createdDate"]); if (custRequestList) { - custReqTaskList = custRequestList.get(0).getRelated("CustRequestWorkEffort"); - if (custReqTaskList) { + custReqTaskList = custRequestList.get(0).getRelated("CustRequestWorkEffort"); + if (custReqTaskList) { custReqTask = custReqTaskList.get(0).getRelatedOne("WorkEffort"); // phase projectChildWorkEffort = custReqTask.getRelatedOne("ParentWorkEffort"); // phase name - if (projectChildWorkEffort) { - partyList = custReqTask.getRelated("WorkEffortPartyAssignment"); - if (partyList) { - context.childWorkEffortId = projectChildWorkEffort.workEffortId; - context.partyId= partyList.get(0).partyId; - } - } - } + if (projectChildWorkEffort) { + partyList = custReqTask.getRelated("WorkEffortPartyAssignment"); + if (partyList) { + context.childWorkEffortId = projectChildWorkEffort.workEffortId; + context.partyId= partyList.get(0).partyId; + } + } + } } \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl Mon Aug 17 11:01:25 2009 @@ -47,15 +47,15 @@ </td> <td align="right" valign="top" width="15%"> <#if note.internalNote?if_exists == "N"> - <div>${uiLabelMap.ProjectMgrPrintableNote}</div> - <#if project?has_content> + <div>${uiLabelMap.ProjectMgrPrintableNote}</div> + <#if project?has_content> <a href="<@ofbizUrl>updateProjectNote?workEffortId=${project.workEffortId?if_exists}¬eId=${note.noteId}&internalNote=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNotesPrivate}</a> <#else> <a href="<@ofbizUrl>updateTaskNoteSummary?workEffortId=${task.workEffortId?if_exists}¬eId=${note.noteId}&internalNote=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNotesPrivate}</a> </#if> </#if> <#if note.internalNote?if_exists == "Y"> - <div>${uiLabelMap.OrderNotPrintableNote}</div> + <div>${uiLabelMap.OrderNotPrintableNote}</div> <#if project?has_content> <a href="<@ofbizUrl>updateProjectNote?workEffortId=${project.workEffortId?if_exists}¬eId=${note.noteId}&internalNote=N</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNotesPublic}</a> <#else> @@ -111,8 +111,8 @@ <select name="internalNote" size="1"><option value=""></option><option value="Y" selected>${uiLabelMap.CommonYes}</option><option value="N">${uiLabelMap.CommonNo}</option></select></td> </tr> <tr> - <td/><td><i>${uiLabelMap.OrderInternalNoteMessage}</i></td> - </tr> + <td/><td><i>${uiLabelMap.OrderInternalNoteMessage}</i></td> + </tr> </table> <#if project?has_content> <a href="javascript:document.createnoteform.submit()" class="buttontext">${uiLabelMap.CommonSave}</a> Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl Mon Aug 17 11:01:25 2009 @@ -23,8 +23,8 @@ </ul> <br class="clear"/> </div> - <table class="basic-table hover-bar" cellspacing="0" > - <tr class="header-row"> + <table class="basic-table hover-bar" cellspacing="0" > + <tr class="header-row"> <td> ${uiLabelMap.CommonNbr} </td> @@ -34,9 +34,9 @@ <td> </td> </tr> - <#list custRequestItems as custRequestItemList> - <#if custRequestItemList.custRequestItemSeqId?has_content> - <tr class="header-row"> + <#list custRequestItems as custRequestItemList> + <#if custRequestItemList.custRequestItemSeqId?has_content> + <tr class="header-row"> <td> </td> <td colspan="2"> @@ -44,7 +44,7 @@ <td> </td> </tr> - <tr> + <tr> <td> <a href="<@ofbizUrl>requestitem?custRequestId=${custRequestItemList.custRequestId}&custRequestItemSeqId=${custRequestItemList.custRequestItemSeqId}</@ofbizUrl>" class="linktext">${custRequestItemList.custRequestItemSeqId}</a> </td> @@ -70,29 +70,29 @@ ${uiLabelMap.CommonDate} </td> </tr> - <#list custRequestItemNoteViews as custRequestItemNoteViewList> - <#if custRequestItemNoteViewList.custRequestItemSeqId == custRequestItemList.custRequestItemSeqId> - <#if row?has_content> - <#assign row=""> - <#else> - <#assign row="alternate-row"> - </#if> - <tr class="${row}"> - <td> - </td> - <td> - ${custRequestItemNoteViewList.noteId} - </td> - <td > - ${custRequestItemNoteViewList.noteInfo} - </td> - <td> - ${custRequestItemNoteViewList.noteDateTime.toString().substring(0,10)} - </td> - </tr> - </#if> - </#list> - </#if> - </#list> - </table> + <#list custRequestItemNoteViews as custRequestItemNoteViewList> + <#if custRequestItemNoteViewList.custRequestItemSeqId == custRequestItemList.custRequestItemSeqId> + <#if row?has_content> + <#assign row=""> + <#else> + <#assign row="alternate-row"> + </#if> + <tr class="${row}"> + <td> + </td> + <td> + ${custRequestItemNoteViewList.noteId} + </td> + <td > + ${custRequestItemNoteViewList.noteInfo} + </td> + <td> + ${custRequestItemNoteViewList.noteDateTime.toString().substring(0,10)} + </td> + </tr> + </#if> + </#list> + </#if> + </#list> + </table> </div> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/manager/PaidOutAndIn.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/manager/PaidOutAndIn.ftl?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/manager/PaidOutAndIn.ftl (original) +++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/manager/PaidOutAndIn.ftl Mon Aug 17 11:01:25 2009 @@ -40,13 +40,13 @@ <option value="${reason.enumId}">${reason.get("description", locale)?default(reason.enumId)}</option> </#list> </#if> - </select> + </select> </td> </tr> <tr> - <td><b>${uiLabelMap.WebPosManagerPaidOutAndIndReasonComment}</b></td> - <td><input type="text" name="reasonCommentInOut" id="reasonCommentInOut" value="${parameters.reasonCommentInOut?default("")}"/></td> - </tr> + <td><b>${uiLabelMap.WebPosManagerPaidOutAndIndReasonComment}</b></td> + <td><input type="text" name="reasonCommentInOut" id="reasonCommentInOut" value="${parameters.reasonCommentInOut?default("")}"/></td> + </tr> <tr> <td colspan="2""> </td> </tr> Modified: ofbiz/trunk/specialpurpose/workflow/webapp/workflow/workflow/workflowMonitor.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/webapp/workflow/workflow/workflowMonitor.ftl?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/workflow/webapp/workflow/workflow/workflowMonitor.ftl (original) +++ ofbiz/trunk/specialpurpose/workflow/webapp/workflow/workflow/workflowMonitor.ftl Mon Aug 17 11:01:25 2009 @@ -70,7 +70,7 @@ </tr> <#list activities as step> <#assign assignments = step.getRelated("WorkEffortPartyAssignment")> - <#assign assignments = EntityUtil.filterByDate(assignments)> + <#assign assignments = EntityUtil.filterByDate(assignments)> <tr> <#-- TODO: add external login ID to external links --> <td class="button-col"><a href="/workeffort/control/activity?workEffortId=${step.workEffortId}" target="workeffort">${step.workflowActivityId}</a></td> Modified: ofbiz/trunk/themes/multiflex/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/multiflex/includes/header.ftl?rev=804935&r1=804934&r2=804935&view=diff ============================================================================== --- ofbiz/trunk/themes/multiflex/includes/header.ftl (original) +++ ofbiz/trunk/themes/multiflex/includes/header.ftl Mon Aug 17 11:01:25 2009 @@ -119,7 +119,7 @@ </#if> </div> - </div> + </div> <!-- Breadcrumbs --> <div class="header-breadcrumbs"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |