svn commit: r737003 [11/11] - in /ofbiz/trunk: ./ applications/accounting/entity
Locked
svn commit: r737003 [11/11] - in /ofbiz/trunk: ./ applications/accounting/entity
 
|
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java Fri Jan 23 03:08:47 2009 @@ -1051,7 +1051,7 @@ if (UtilValidate.isEmpty(expandedDataResourceId)) { if (UtilValidate.isNotEmpty(expandedContentId)) { - content = delegator.findByPrimaryKeyCache("Content", UtilMisc.toMap("contentId", expandedContentId)); + content = delegator.findByPrimaryKeyCache("Content", UtilMisc.toMap("contentId", expandedContentId)); } else { String errMsg = "contentId is empty."; Debug.logError(errMsg, module); @@ -1068,22 +1068,22 @@ GenericValue dataResource = null; if (UtilValidate.isNotEmpty(expandedDataResourceId)) { - dataResource = delegator.findByPrimaryKeyCache("DataResource", UtilMisc.toMap("dataResourceId", expandedDataResourceId)); + dataResource = delegator.findByPrimaryKeyCache("DataResource", UtilMisc.toMap("dataResourceId", expandedDataResourceId)); this.dataResourceId = FlexibleStringExpander.getInstance(expandedDataResourceId); } String mimeTypeId = null; if (dataResource != null) { - mimeTypeId = dataResource.getString("mimeTypeId"); + mimeTypeId = dataResource.getString("mimeTypeId"); } if (UtilValidate.isNotEmpty(mimeTypeId) - && ((mimeTypeId.indexOf("application") >= 0) || (mimeTypeId.indexOf("image")) >= 0) ) { - screenStringRenderer.renderContentFrame(writer, context, this); + && ((mimeTypeId.indexOf("application") >= 0) || (mimeTypeId.indexOf("image")) >= 0) ) { + screenStringRenderer.renderContentFrame(writer, context, this); } else { - screenStringRenderer.renderContentBegin(writer, context, this); - screenStringRenderer.renderContentBody(writer, context, this); - screenStringRenderer.renderContentEnd(writer, context, this); + screenStringRenderer.renderContentBegin(writer, context, this); + screenStringRenderer.renderContentBody(writer, context, this); + screenStringRenderer.renderContentEnd(writer, context, this); } ((MapStack) context).pop(); } catch (IOException e) { Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java Fri Jan 23 03:08:47 2009 @@ -288,7 +288,7 @@ } public Map<String, Object> getContext() { - return context; + return context; } public void populateContextForService(DispatchContext dctx, Map<String, Object> serviceContext) { Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java Fri Jan 23 03:08:47 2009 @@ -270,12 +270,12 @@ context.put("queryString", queryString); context.put("queryStringMap", result.get("queryStringMap")); if (UtilValidate.isNotEmpty(queryString)){ - try { - String queryStringEncoded = queryString.replaceAll("&", "%26"); + try { + String queryStringEncoded = queryString.replaceAll("&", "%26"); context.put("queryStringEncoded", queryStringEncoded); - } catch (PatternSyntaxException e) { - - } + } catch (PatternSyntaxException e) { + + } } } else { context.putAll(result); @@ -290,11 +290,11 @@ if (UtilValidate.isNotEmpty(resultMapListName)) { List<? extends Map<String, ? extends Object>> lst = UtilGenerics.checkList(result.get(resultMapListName)); if (lst != null) { - if (lst instanceof ListIterator) { + if (lst instanceof ListIterator) { this.modelSubNode.setListIterator((ListIterator) lst); - } else { - this.modelSubNode.setListIterator(lst.listIterator()); - } + } else { + this.modelSubNode.setListIterator(lst.listIterator()); + } } } } else { Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeCondition.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeCondition.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeCondition.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeCondition.java Fri Jan 23 03:08:47 2009 @@ -447,8 +447,8 @@ } public boolean eval(Map<String, Object> context) { - - boolean passed = permissionChecker.runPermissionCheck(context); + + boolean passed = permissionChecker.runPermissionCheck(context); return passed; } } Modified: ofbiz/trunk/specialpurpose/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/build.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/build.xml (original) +++ ofbiz/trunk/specialpurpose/build.xml Fri Jan 23 03:08:47 2009 @@ -30,7 +30,7 @@ ebay/build.xml, projectmgr/build.xml, ldap/build.xml, - webpos/build.xml"/> + webpos/build.xml"/> <!-- For the old OFBiz Workflow Engine add "workflow/build.xml" to the list above --> <!-- For Shark add "shark/build.xml" to the list above, in the specialpurpose-builds list (after workflow) --> Modified: ofbiz/trunk/specialpurpose/mypage/data/MyPageDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/data/MyPageDemoData.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/mypage/data/MyPageDemoData.xml (original) +++ ofbiz/trunk/specialpurpose/mypage/data/MyPageDemoData.xml Fri Jan 23 03:08:47 2009 @@ -19,7 +19,7 @@ --> <entity-engine-xml> - <!-- allow admin to read company communications --> + <!-- allow admin to read company communications --> <PartyRole partyId="admin" roleTypeId="EMAIL_ADMIN"/> <PartyRelationship partyIdFrom="admin" roleTypeIdFrom="EMAIL_ADMIN" partyIdTo="Company" roleTypeIdTo="_NA_" fromDate="2000-01-01 00:00:00"/> Modified: ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/MyPageServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/MyPageServices.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/MyPageServices.xml (original) +++ ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/MyPageServices.xml Fri Jan 23 03:08:47 2009 @@ -94,7 +94,7 @@ </entity-one> <set field="getPartyEmail.partyId" from-field="custReq.fromPartyId"/> <call-service service-name="getPartyEmail" in-map-name="getPartyEmail"> - <result-to-field result-name="emailAddress" field="emailParams.sendTo"/> + <result-to-field result-name="emailAddress" field="emailParams.sendTo"/> </call-service> <entity-and list="webSites" entity-name="WebSite"> <field-map field-name="productStoreId" from-field="storeEmail.productStoreId" /> Modified: ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/actions/GetMyCommunicationEventRole.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/actions/GetMyCommunicationEventRole.groovy?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/actions/GetMyCommunicationEventRole.groovy (original) +++ ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/actions/GetMyCommunicationEventRole.groovy Fri Jan 23 03:08:47 2009 @@ -21,12 +21,12 @@ import org.ofbiz.entity.util.EntityUtil; if (parameters.communicationEventId) { - communicationEventRoles = delegator.findByAnd("CommunicationEventRole", - ["communicationEventId" : parameters.communicationEventId, - "partyId" : userLogin.partyId, - "statusId" : "COM_ROLE_READ" - ]); - if (!communicationEventRoles) { + communicationEventRoles = delegator.findByAnd("CommunicationEventRole", + ["communicationEventId" : parameters.communicationEventId, + "partyId" : userLogin.partyId, + "statusId" : "COM_ROLE_READ" + ]); + if (!communicationEventRoles) { communicationEventRoles = delegator.findByAnd("CommunicationEventRole", ["communicationEventId" : parameters.communicationEventId, "partyId" : userLogin.partyId Modified: ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml Fri Jan 23 03:08:47 2009 @@ -143,56 +143,56 @@ </section> </screen> - <screen name="main"> - <section> - <actions> + <screen name="main"> + <section> + <actions> <set field="headerItem" value="main" /> <set field="parameters.donePage" value="main"/> <!-- refresh every 3 minutes --> <!-- set field="layoutSettings.extraHead" value="<META HTTP-EQUIV="REFRESH" CONTENT="180">"/--> - </actions> - <widgets> - <decorator-screen name="main-decorator" + </actions> + <widgets> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <section> - <condition> - <if-has-permission permission="MYPAGE_EMPLOYEE" /> - </condition> - <actions> - <set field="decorator" value="Y"/> - </actions> - <widgets> - <include-screen name="mainEmployee" /> - </widgets> - </section> - <section> - <condition> - <if-has-permission permission="MYPAGE_CUSTOMER" /> - </condition> - <actions> - <set field="decorator" value="Y"/> - </actions> - <widgets> - <include-screen name="mainCustomer" /> - </widgets> - </section> - <section> - <condition> - <and> - <not><if-has-permission permission="MYPAGE_CUSTOMER"/></not> - <not><if-has-permission permission="MYPAGE_EMPLOYEE"/></not> - </and> - </condition> - <widgets> - <include-screen name="mainNoAccess" /> - </widgets> - </section> + <section> + <condition> + <if-has-permission permission="MYPAGE_EMPLOYEE" /> + </condition> + <actions> + <set field="decorator" value="Y"/> + </actions> + <widgets> + <include-screen name="mainEmployee" /> + </widgets> + </section> + <section> + <condition> + <if-has-permission permission="MYPAGE_CUSTOMER" /> + </condition> + <actions> + <set field="decorator" value="Y"/> + </actions> + <widgets> + <include-screen name="mainCustomer" /> + </widgets> + </section> + <section> + <condition> + <and> + <not><if-has-permission permission="MYPAGE_CUSTOMER"/></not> + <not><if-has-permission permission="MYPAGE_EMPLOYEE"/></not> + </and> + </condition> + <widgets> + <include-screen name="mainNoAccess" /> + </widgets> + </section> </decorator-section> </decorator-screen> - </widgets> - </section> - </screen> + </widgets> + </section> + </screen> <screen name="mainEmployee"> <section> Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml (original) +++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml Fri Jan 23 03:08:47 2009 @@ -187,26 +187,26 @@ </widgets> </section> </screen> - <screen name="Communications"> - <section> - <actions> + <screen name="Communications"> + <section> + <actions> <set field="all" from-field="parameters.all"/> - <entity-condition entity-name="CommunicationEventAndRole" - list-name="commEvents"> - <condition-list combine="and"> + <entity-condition entity-name="CommunicationEventAndRole" + list-name="commEvents"> + <condition-list combine="and"> <condition-expr field-name="statusId" operator="not-equals" value="COM_UNKNOWN_PARTY" /> <condition-expr field-name="statusId" operator="not-equals" value="COM_PENDING" /> - <condition-expr field-name="partyId" operator="equals" - value="${partyId}" /> + <condition-expr field-name="partyId" operator="equals" + value="${partyId}" /> <condition-expr field-name="roleStatusId" operator="not-equals" value="COM_ROLE_COMPLETED" ignore="${all}" /> - </condition-list> - <order-by field-name="-datetimeStarted" /> - </entity-condition> - <entity-condition entity-name="CommunicationEventAndRole" - list-name="commEventsUnknown"> + </condition-list> + <order-by field-name="-datetimeStarted" /> + </entity-condition> + <entity-condition entity-name="CommunicationEventAndRole" + list-name="commEventsUnknown"> <condition-list combine="and"> <condition-expr field-name="statusId" operator="equals" value="COM_UNKNOWN_PARTY" /> @@ -216,16 +216,16 @@ value="${partyId}" /> </condition-list> <order-by field-name="-datetimeStarted" /> - </entity-condition> - <entity-condition entity-name="CommunicationEventAndRole" list-name="commEventDraft"> - <condition-list combine="and"> - <condition-expr field-name="statusId" operator="equals" - value="COM_PENDING"/> - <condition-expr field-name="partyId" operator="equals" - value="${partyId}"/> - </condition-list> - <order-by field-name="-datetimeStarted" /> - </entity-condition> + </entity-condition> + <entity-condition entity-name="CommunicationEventAndRole" list-name="commEventDraft"> + <condition-list combine="and"> + <condition-expr field-name="statusId" operator="equals" + value="COM_PENDING"/> + <condition-expr field-name="partyId" operator="equals" + value="${partyId}"/> + </condition-list> + <order-by field-name="-datetimeStarted" /> + </entity-condition> <entity-one entity-name="PartyNameView" value-name="partyName"> <field-map field-name="partyId" env-name="partyId"/> </entity-one> Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalDemoData.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/data/MyPortalDemoData.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalDemoData.xml Fri Jan 23 03:08:47 2009 @@ -19,7 +19,7 @@ --> <entity-engine-xml> - <!-- allow admin to read company communications --> + <!-- allow admin to read company communications --> <PartyRole partyId="admin" roleTypeId="EMAIL_ADMIN"/> <PartyRelationship partyIdFrom="admin" roleTypeIdFrom="EMAIL_ADMIN" partyIdTo="Company" roleTypeIdTo="_NA_" fromDate="2000-01-01 00:00:00"/> Modified: ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml Fri Jan 23 03:08:47 2009 @@ -94,7 +94,7 @@ </entity-one> <set field="getPartyEmail.partyId" from-field="custReq.fromPartyId"/> <call-service service-name="getPartyEmail" in-map-name="getPartyEmail"> - <result-to-field result-name="emailAddress" field="emailParams.sendTo"/> + <result-to-field result-name="emailAddress" field="emailParams.sendTo"/> </call-service> <entity-and list="webSites" entity-name="WebSite"> <field-map field-name="productStoreId" from-field="storeEmail.productStoreId" /> Modified: ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/actions/GetMyCommunicationEventRole.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/actions/GetMyCommunicationEventRole.groovy?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/actions/GetMyCommunicationEventRole.groovy (original) +++ ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/actions/GetMyCommunicationEventRole.groovy Fri Jan 23 03:08:47 2009 @@ -21,12 +21,12 @@ import org.ofbiz.entity.util.EntityUtil; if (parameters.communicationEventId) { - communicationEventRoles = delegator.findByAnd("CommunicationEventRole", - ["communicationEventId" : parameters.communicationEventId, - "partyId" : userLogin.partyId, - "statusId" : "COM_ROLE_READ" - ]); - if (!communicationEventRoles) { + communicationEventRoles = delegator.findByAnd("CommunicationEventRole", + ["communicationEventId" : parameters.communicationEventId, + "partyId" : userLogin.partyId, + "statusId" : "COM_ROLE_READ" + ]); + if (!communicationEventRoles) { communicationEventRoles = delegator.findByAnd("CommunicationEventRole", ["communicationEventId" : parameters.communicationEventId, "partyId" : userLogin.partyId Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml Fri Jan 23 03:08:47 2009 @@ -188,26 +188,26 @@ </widgets> </section> </screen> - <screen name="Communications"> - <section> - <actions> + <screen name="Communications"> + <section> + <actions> <set field="all" from-field="parameters.all"/> - <entity-condition entity-name="CommunicationEventAndRole" - list-name="commEvents"> - <condition-list combine="and"> + <entity-condition entity-name="CommunicationEventAndRole" + list-name="commEvents"> + <condition-list combine="and"> <condition-expr field-name="statusId" operator="not-equals" value="COM_UNKNOWN_PARTY" /> <condition-expr field-name="statusId" operator="not-equals" value="COM_PENDING" /> - <condition-expr field-name="partyId" operator="equals" - value="${partyId}" /> + <condition-expr field-name="partyId" operator="equals" + value="${partyId}" /> <condition-expr field-name="roleStatusId" operator="not-equals" value="COM_ROLE_COMPLETED" ignore="${all}" /> - </condition-list> - <order-by field-name="-datetimeStarted" /> - </entity-condition> - <entity-condition entity-name="CommunicationEventAndRole" - list-name="commEventsUnknown"> + </condition-list> + <order-by field-name="-datetimeStarted" /> + </entity-condition> + <entity-condition entity-name="CommunicationEventAndRole" + list-name="commEventsUnknown"> <condition-list combine="and"> <condition-expr field-name="statusId" operator="equals" value="COM_UNKNOWN_PARTY" /> @@ -217,16 +217,16 @@ value="${partyId}" /> </condition-list> <order-by field-name="-datetimeStarted" /> - </entity-condition> - <entity-condition entity-name="CommunicationEventAndRole" list-name="commEventDraft"> - <condition-list combine="and"> - <condition-expr field-name="statusId" operator="equals" - value="COM_PENDING"/> - <condition-expr field-name="partyId" operator="equals" - value="${partyId}"/> - </condition-list> - <order-by field-name="-datetimeStarted" /> - </entity-condition> + </entity-condition> + <entity-condition entity-name="CommunicationEventAndRole" list-name="commEventDraft"> + <condition-list combine="and"> + <condition-expr field-name="statusId" operator="equals" + value="COM_PENDING"/> + <condition-expr field-name="partyId" operator="equals" + value="${partyId}"/> + </condition-list> + <order-by field-name="-datetimeStarted" /> + </entity-condition> <entity-one entity-name="PartyNameView" value-name="partyName"> <field-map field-name="partyId" env-name="partyId"/> </entity-one> Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java Fri Jan 23 03:08:47 2009 @@ -218,8 +218,8 @@ } public BigDecimal getTotalDue() { - BigDecimal grandTotal = this.getGrandTotal(); - BigDecimal paymentAmt = this.getPaymentTotal(); + BigDecimal grandTotal = this.getGrandTotal(); + BigDecimal paymentAmt = this.getPaymentTotal(); return grandTotal.subtract(paymentAmt); } @@ -937,8 +937,8 @@ public void appendTotalDataModel(XModel model) { if (cart != null) { - BigDecimal taxAmount = cart.getTotalSalesTax(); - BigDecimal total = cart.getGrandTotal(); + BigDecimal taxAmount = cart.getTotalSalesTax(); + BigDecimal total = cart.getGrandTotal(); List adjustments = cart.getAdjustments(); BigDecimal itemsAdjustmentsAmount = BigDecimal.ZERO; @@ -971,7 +971,7 @@ Journal.appendNode(adjustmentLine, "td", "qty", ""); Journal.appendNode(adjustmentLine, "td", "price", UtilFormatOut.formatPrice(amount.doubleValue())); } else if (UtilValidate.isNotEmpty(sourcePercentage)) { - BigDecimal percentage = sourcePercentage.movePointLeft(2).negate(); // sourcePercentage is negative and must be show as a positive value (it's a discount not an amount) + BigDecimal percentage = sourcePercentage.movePointLeft(2).negate(); // sourcePercentage is negative and must be show as a positive value (it's a discount not an amount) Journal.appendNode(adjustmentLine, "td", "qty", UtilFormatOut.formatPercentage(percentage.doubleValue())); amount = cart.getItemTotal().add(itemsAdjustmentsAmount).multiply(percentage); // itemsAdjustmentsAmount is negative Journal.appendNode(adjustmentLine, "td", "price", UtilFormatOut.formatPrice(amount.negate().doubleValue())); // amount must be shown as a negative value @@ -1038,7 +1038,7 @@ public void appendChangeDataModel(XModel model) { if (cart != null) { - BigDecimal changeDue = this.getTotalDue().negate(); + BigDecimal changeDue = this.getTotalDue().negate(); if (changeDue.compareTo(BigDecimal.ZERO) >= 0) { XModel changeLine = Journal.appendNode(model, "tr", "", ""); Journal.appendNode(changeLine, "td", "sku", ""); Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java Fri Jan 23 03:08:47 2009 @@ -52,7 +52,7 @@ protected XTable jtable = null; protected String style = null; - public Journal(PosScreen page) { + public Journal(PosScreen page) { jpanel = (XScrollPane) page.findComponent("journal_panel"); jpanel.setVisible(false); Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java Fri Jan 23 03:08:47 2009 @@ -80,7 +80,7 @@ Input input = pos.getInput(); String value = input.value(); if (UtilValidate.isNotEmpty(value)) { - BigDecimal price = BigDecimal.ZERO; + BigDecimal price = BigDecimal.ZERO; boolean parsed = false; try { price = new BigDecimal(value); Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/MenuEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/MenuEvents.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/MenuEvents.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/MenuEvents.java Fri Jan 23 03:08:47 2009 @@ -150,7 +150,7 @@ } else { // check for quantity - BigDecimal quantity = BigDecimal.ONE; + BigDecimal quantity = BigDecimal.ONE; if (func != null && "QTY".equals(func[0])) { try { quantity = new BigDecimal(func[1]); Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java Fri Jan 23 03:08:47 2009 @@ -41,7 +41,7 @@ // all cash transactions are NO_PAYMENT; no need to check try { - BigDecimal amount = processAmount(trans, pos, null); + BigDecimal amount = processAmount(trans, pos, null); Debug.log("Processing [Cash] Amount : " + amount, module); // add the payment @@ -213,7 +213,7 @@ case 3: firstName = msrInfoArr[2]; case 2: // card number & exp date found - BigDecimal amount = BigDecimal.ZERO; + BigDecimal amount = BigDecimal.ZERO; try { String[] totalInfo = input.getFunction("TOTAL"); amount = processAmount(trans, pos, totalInfo[1]); @@ -260,7 +260,7 @@ PosTransaction trans = PosTransaction.getCurrentTx(pos.getSession()); try { - BigDecimal amount = processAmount(trans, pos, null); + BigDecimal amount = processAmount(trans, pos, null); Debug.log("Processing [" + paymentMethodTypeId + "] Amount : " + amount, module); // add the payment @@ -283,7 +283,7 @@ input.clearInput(); try { - BigDecimal amount = processAmount(trans, pos, amountStr); + BigDecimal amount = processAmount(trans, pos, amountStr); Debug.log("Processing [" + paymentMethodTypeId + "] Amount : " + amount, module); // add the payment Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/KeyboardService.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/KeyboardService.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/KeyboardService.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/KeyboardService.java Fri Jan 23 03:08:47 2009 @@ -63,7 +63,7 @@ while (props.hasMoreElements()) { String propName = (String) props.nextElement(); if (propName.startsWith("key.")) { - String propValue = (String) entry.getPropertyValue(propName); + String propValue = (String) entry.getPropertyValue(propName); propName = propName.substring(4); PosKey key = new PosKey(propName, propValue); Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Fri Jan 23 03:08:47 2009 @@ -1315,35 +1315,35 @@ <set field="getProject.taskId" from-field="parameters.workEffortId"/> <call-service service-name="getProjectIdAndNameFromTask" in-map-name="getProject"> <result-to-field result-name="projectId"/> - </call-service> - <!-- see who is reponsible for testing/validation in this project --> - <entity-condition entity-name="WorkEffortPartyAssignment" list="assigns" filter-by-date="true"> - <condition-list combine="and"> - <condition-expr field-name="workEffortId" operator="equals" from-field="projectId"/> - <condition-expr field-name="partyId" operator="not-equals" from-field="parameters.partyId"/><!-- should not test/val own work --> - <condition-list combine="or"> - <condition-expr field-name="roleTypeId" operator="equals" value="PROVIDER_VALIDATOR"/> - <condition-expr field-name="roleTypeId" operator="equals" value="PROVIDER_TESTER"/> - </condition-list> - </condition-list> - </entity-condition> - <if-not-empty field="assigns"> - <set field="addAssign.workEffortId" from-field="parameters.workEffortId"/> - <set field="addAssign.statusId" value="PAS_ASSIGNED"/> - <iterate entry="assign" list="assigns"> - <make-value value-field="newAssign" entity-name="WorkEffortPartyAssignment"/> - <set field="newAssign.workEffortId" from-field="parameters.workEffortId"/> - <set field="newAssign.partyId" from-field="assign.partyId"/> - <set field="newAssign.roleTypeId" from-field="assign.roleTypeId"/> - <set field="newAssign.assignedByUserLoginId" value="system"/> - <now-date-to-env field="newAssign.fromDate"/> - <set field="newAssign.statusId" value="PAS_ASSIGNED"/> - <create-value value-field="newAssign"/> - </iterate> - <else> - <log level="info" message="No validation parties defined in this project: no validation parties added...."></log> - </else> - </if-not-empty> + </call-service> + <!-- see who is reponsible for testing/validation in this project --> + <entity-condition entity-name="WorkEffortPartyAssignment" list="assigns" filter-by-date="true"> + <condition-list combine="and"> + <condition-expr field-name="workEffortId" operator="equals" from-field="projectId"/> + <condition-expr field-name="partyId" operator="not-equals" from-field="parameters.partyId"/><!-- should not test/val own work --> + <condition-list combine="or"> + <condition-expr field-name="roleTypeId" operator="equals" value="PROVIDER_VALIDATOR"/> + <condition-expr field-name="roleTypeId" operator="equals" value="PROVIDER_TESTER"/> + </condition-list> + </condition-list> + </entity-condition> + <if-not-empty field="assigns"> + <set field="addAssign.workEffortId" from-field="parameters.workEffortId"/> + <set field="addAssign.statusId" value="PAS_ASSIGNED"/> + <iterate entry="assign" list="assigns"> + <make-value value-field="newAssign" entity-name="WorkEffortPartyAssignment"/> + <set field="newAssign.workEffortId" from-field="parameters.workEffortId"/> + <set field="newAssign.partyId" from-field="assign.partyId"/> + <set field="newAssign.roleTypeId" from-field="assign.roleTypeId"/> + <set field="newAssign.assignedByUserLoginId" value="system"/> + <now-date-to-env field="newAssign.fromDate"/> + <set field="newAssign.statusId" value="PAS_ASSIGNED"/> + <create-value value-field="newAssign"/> + </iterate> + <else> + <log level="info" message="No validation parties defined in this project: no validation parties added...."></log> + </else> + </if-not-empty> <else> <log level="info" message="Not the last party who completes his task: validation parties not added...."></log> </else> Modified: ofbiz/trunk/specialpurpose/projectmgr/src/org/ofbiz/project/Various.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/src/org/ofbiz/project/Various.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/src/org/ofbiz/project/Various.java (original) +++ ofbiz/trunk/specialpurpose/projectmgr/src/org/ofbiz/project/Various.java Fri Jan 23 03:08:47 2009 @@ -39,84 +39,84 @@ public static void setDatesFollowingTasks(GenericValue task) { - - try { - List assocs = task.getRelated("FromWorkEffortAssoc"); - if (UtilValidate.isNotEmpty(assocs)) { - Iterator a = assocs.iterator(); - while (a.hasNext()) { - GenericValue assoc = (GenericValue) a.next(); - GenericValue nextTask = assoc.getRelatedOne("ToWorkEffort"); - Timestamp newStartDate = task.getTimestamp("estimatedCompletionDate"); // start of next task the next day - if (nextTask.get("estimatedStartDate") == null || nextTask.getTimestamp("estimatedStartDate").before(newStartDate) ) { - nextTask.put("estimatedStartDate", UtilDateTime.addDaysToTimestamp(task.getTimestamp("estimatedCompletionDate"), 1)); // start of next task the next day - nextTask.put("estimatedCompletionDate", calculateCompletionDate(nextTask, task.getTimestamp("estimatedCompletionDate"))); - nextTask.store(); - } - setDatesFollowingTasks(nextTask); - } - } + + try { + List assocs = task.getRelated("FromWorkEffortAssoc"); + if (UtilValidate.isNotEmpty(assocs)) { + Iterator a = assocs.iterator(); + while (a.hasNext()) { + GenericValue assoc = (GenericValue) a.next(); + GenericValue nextTask = assoc.getRelatedOne("ToWorkEffort"); + Timestamp newStartDate = task.getTimestamp("estimatedCompletionDate"); // start of next task the next day + if (nextTask.get("estimatedStartDate") == null || nextTask.getTimestamp("estimatedStartDate").before(newStartDate) ) { + nextTask.put("estimatedStartDate", UtilDateTime.addDaysToTimestamp(task.getTimestamp("estimatedCompletionDate"), 1)); // start of next task the next day + nextTask.put("estimatedCompletionDate", calculateCompletionDate(nextTask, task.getTimestamp("estimatedCompletionDate"))); + nextTask.store(); + } + setDatesFollowingTasks(nextTask); + } + } - } catch (GenericEntityException e) { - Debug.logError("Could not updte task: " + e.getMessage(), module); - } + } catch (GenericEntityException e) { + Debug.logError("Could not updte task: " + e.getMessage(), module); + } } public static Timestamp calculateCompletionDate(GenericValue task, Timestamp startDate) { - Double plannedHours = 0.00; - try { - // get planned hours - List standards = task.getRelated("WorkEffortSkillStandard"); - Iterator t = standards.iterator(); - while (t.hasNext()) { - GenericValue standard = (GenericValue) t.next(); - if (standard.getDouble("estimatedNumPeople") == null) { - standard.put("estimatedNumPeople", new Double("1")); - } - if (standard.get("estimatedDuration") != null) { - plannedHours += standard.getDouble("estimatedDuration").doubleValue() / standard.getDouble("estimatedNumPeople").doubleValue(); - } - } + Double plannedHours = 0.00; + try { + // get planned hours + List standards = task.getRelated("WorkEffortSkillStandard"); + Iterator t = standards.iterator(); + while (t.hasNext()) { + GenericValue standard = (GenericValue) t.next(); + if (standard.getDouble("estimatedNumPeople") == null) { + standard.put("estimatedNumPeople", new Double("1")); + } + if (standard.get("estimatedDuration") != null) { + plannedHours += standard.getDouble("estimatedDuration").doubleValue() / standard.getDouble("estimatedNumPeople").doubleValue(); + } + } - } catch (GenericEntityException e) { - Debug.logError("Could not updte task: " + e.getMessage(), module); - } - if (plannedHours == 0.00) { - plannedHours = new Double("24.00"); // default length of task is 3 days. - } - - // only add days which are not saturday(7) or sunday(1) - int days = plannedHours.intValue() / 8; - while (days > 0) { - int dayNumber = UtilDateTime.dayNumber(startDate); - if (dayNumber != 1 && dayNumber != 7) { - days--; - } - startDate = UtilDateTime.addDaysToTimestamp(startDate, 1); - } - return startDate; + } catch (GenericEntityException e) { + Debug.logError("Could not updte task: " + e.getMessage(), module); + } + if (plannedHours == 0.00) { + plannedHours = new Double("24.00"); // default length of task is 3 days. + } + + // only add days which are not saturday(7) or sunday(1) + int days = plannedHours.intValue() / 8; + while (days > 0) { + int dayNumber = UtilDateTime.dayNumber(startDate); + if (dayNumber != 1 && dayNumber != 7) { + days--; + } + startDate = UtilDateTime.addDaysToTimestamp(startDate, 1); + } + return startDate; } public static double calculateActualHours(GenericDelegator delegator, String timesheetId) { - List actuals = FastList.newInstance(); - double actualHours = 0.00; - if(timesheetId != null){ - try { - actuals = delegator.findByAnd("TimeEntry", UtilMisc.toMap("timesheetId", timesheetId)); - if(actuals.size() > 0){ - Iterator ite = actuals.iterator(); - while(ite.hasNext()){ - GenericValue actual =(GenericValue)ite.next(); - Double hour = (Double) actual.get("hours"); - double hours = hour.doubleValue(); - actualHours = actualHours + hours; - } - } - } catch (GenericEntityException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - return actualHours; + List actuals = FastList.newInstance(); + double actualHours = 0.00; + if(timesheetId != null){ + try { + actuals = delegator.findByAnd("TimeEntry", UtilMisc.toMap("timesheetId", timesheetId)); + if(actuals.size() > 0){ + Iterator ite = actuals.iterator(); + while(ite.hasNext()){ + GenericValue actual =(GenericValue)ite.next(); + Double hour = (Double) actual.get("hours"); + double hours = hour.doubleValue(); + actualHours = actualHours + hours; + } + } + } catch (GenericEntityException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + return actualHours; } } 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=737003&r1=737002&r2=737003&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 Fri Jan 23 03:08:47 2009 @@ -24,17 +24,17 @@ projects = []; allProjects.each { project -> - result = dispatcher.runSync("getProject", ["userLogin" : parameters.userLogin, "projectId" : project.workEffortId]); - if (result.projectInfo) { - if (!result.projectInfo.currentStatusId.equals("PTS_COMPLETED") && !result.projectInfo.currentStatusId.equals("PTS_CANCELLED") && !result.projectInfo.currentStatusId.equals("PRJ_CLOSED")) { - 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); - } - } - } + result = dispatcher.runSync("getProject", ["userLogin" : parameters.userLogin, "projectId" : project.workEffortId]); + if (result.projectInfo) { + if (!result.projectInfo.currentStatusId.equals("PTS_COMPLETED") && !result.projectInfo.currentStatusId.equals("PTS_CANCELLED") && !result.projectInfo.currentStatusId.equals("PRJ_CLOSED")) { + 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; + context.projects = projects; } \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListResourceBillingHours.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListResourceBillingHours.groovy?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListResourceBillingHours.groovy (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListResourceBillingHours.groovy Fri Jan 23 03:08:47 2009 @@ -28,8 +28,8 @@ cond = - EntityCondition.makeCondition( - [EntityCondition.makeCondition ("workEffortTypeId", EntityOperator.EQUALS, "PROJECT"), + EntityCondition.makeCondition( + [EntityCondition.makeCondition ("workEffortTypeId", EntityOperator.EQUALS, "PROJECT"), EntityCondition.makeCondition ("partyId", EntityOperator.EQUALS, parameters.partyId) ],EntityOperator.AND); allProjects = delegator.findList("WorkEffortAndPartyAssign", cond, (HashSet) ["workEffortId"], ["workEffortName"], null, true); Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectBilling.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectBilling.groovy?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectBilling.groovy (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectBilling.groovy Fri Jan 23 03:08:47 2009 @@ -34,14 +34,14 @@ // check if latest invoice generated is still in process so allow re-generation to correct errors entryIterator = delegator.find("ProjectPhaseTaskAndTimeEntryTimeSheet", entryExprs, null, null, orderBy, null); while (entryItem = entryIterator.next()) { - invoice = entryItem.getRelatedOne("Invoice"); - if (invoice.getString("statusId").equals("INVOICE_IN_PROCESS")) { - context.partyIdFrom = invoice.partyIdFrom; - context.partyId = invoice.partyId; - context.invoiceId = invoice.invoiceId; - break; - } - } + invoice = entryItem.getRelatedOne("Invoice"); + if (invoice.getString("statusId").equals("INVOICE_IN_PROCESS")) { + context.partyIdFrom = invoice.partyIdFrom; + context.partyId = invoice.partyId; + context.invoiceId = invoice.invoiceId; + break; + } + } entryIterator.close(); //start of this month context.thruDate = UtilDateTime.getMonthStart(UtilDateTime.nowTimestamp()); Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Fri Jan 23 03:08:47 2009 @@ -649,11 +649,11 @@ <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time type="timestamp"/></field> <field name="invoiceId"><hidden/></field> <field name="reCreate" position="1" title="re-create Invoice: ${invoiceId}" use-when="context.get("invoiceId")!=null"> - <drop-down no-current-selected-key="N"> - <option key="Y" description="Yes"/> - <option key="N" description="No"/> - </drop-down> - </field> + <drop-down no-current-selected-key="N"> + <option key="Y" description="Yes"/> + <option key="N" description="No"/> + </drop-down> + </field> <field name="submitButton" title="${uiLabelMap.PageTitleAddProjectTimeToNewInvoice}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListContents" extends="ListWorkEffortContents" extends-resource="component://workeffort/widget/WorkEffortForms.xml"> Modified: ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml (original) +++ ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml Fri Jan 23 03:08:47 2009 @@ -306,15 +306,15 @@ </call-class-method> <if-compare field="isDouble" operator="equals" value="true"> <make-value value-field="internTx" entity-name="PosTerminalInternTx"/> - <call-object-method obj-field="webPosTransaction" method-name="getTerminalLogId" ret-field="internTx.posTerminalLogId"/> - <set field="internTx.paidAmount" from-field="parameters.amountInOut"/> - <set field="internTx.reasonComment" from-field="parameters.reasonCommentInOut"/> - <set field="internTx.reasonEnumId" from-field="parameters.reasonInOut"/> - <create-value value-field="internTx"/> - <set from-field="parameters.type" field="paidInOut"/> - <call-object-method obj-field="webPosTransaction" method-name="paidInOut"> - <field field="paidInOut" type="String"/> - </call-object-method> + <call-object-method obj-field="webPosTransaction" method-name="getTerminalLogId" ret-field="internTx.posTerminalLogId"/> + <set field="internTx.paidAmount" from-field="parameters.amountInOut"/> + <set field="internTx.reasonComment" from-field="parameters.reasonCommentInOut"/> + <set field="internTx.reasonEnumId" from-field="parameters.reasonInOut"/> + <create-value value-field="internTx"/> + <set from-field="parameters.type" field="paidInOut"/> + <call-object-method obj-field="webPosTransaction" method-name="paidInOut"> + <field field="paidInOut" type="String"/> + </call-object-method> <else> <add-error><fail-property resource="WebPosUiLabels" property="WebPosManagerPaidOutAndIndAmountNotValid"/></add-error> <check-errors/> Modified: ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/PaymentEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/PaymentEvents.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/PaymentEvents.xml (original) +++ ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/PaymentEvents.xml Fri Jan 23 03:08:47 2009 @@ -430,15 +430,15 @@ <log level="always" message="refNumCheck ${parameters.refNumCheck}"/> <if-not-empty field="parameters.refNumCheck"> <set field="idx" from-field="payment"/> - <set field="refNum" from-field="parameters.refNumCheck"/> - <call-object-method obj-field="webPosTransaction" method-name="setPaymentRefNum"> - <field field="idx" type="int"/> - <field field="refNum" type="String"/> - <field field="authCode" type="String"/> - </call-object-method> - <check-errors/> - <log level="info" message="Set the reference number ${idx} to ${refNum} for payment CHECK"/> - <else> + <set field="refNum" from-field="parameters.refNumCheck"/> + <call-object-method obj-field="webPosTransaction" method-name="setPaymentRefNum"> + <field field="idx" type="int"/> + <field field="refNum" type="String"/> + <field field="authCode" type="String"/> + </call-object-method> + <check-errors/> + <log level="info" message="Set the reference number ${idx} to ${refNum} for payment CHECK"/> + <else> <set field="payment" from-field="numPayments"/> <add-error><fail-property resource="WebPosUiLabels" property="WebPosPaymentCheckMissingRefNum"/></add-error> <check-errors/> @@ -449,16 +449,16 @@ <log level="always" message="refNumGift ${parameters.refNumGift}"/> <if-not-empty field="parameters.refNumGift"> <set field="idx" from-field="payment"/> - <set field="refNum" from-field="parameters.refNumGift"/> - <call-object-method obj-field="webPosTransaction" method-name="setPaymentRefNum"> - <field field="idx" type="int"/> - <field field="refNum" type="String"/> - <field field="authCode" type="String"/> - </call-object-method> - <check-errors/> - <log level="info" message="Set the reference number ${idx} to ${refNum} for payment GIFT CARD"/> - <else> - <set field="payment" from-field="numPayments"/> + <set field="refNum" from-field="parameters.refNumGift"/> + <call-object-method obj-field="webPosTransaction" method-name="setPaymentRefNum"> + <field field="idx" type="int"/> + <field field="refNum" type="String"/> + <field field="authCode" type="String"/> + </call-object-method> + <check-errors/> + <log level="info" message="Set the reference number ${idx} to ${refNum} for payment GIFT CARD"/> + <else> + <set field="payment" from-field="numPayments"/> <add-error><fail-property resource="WebPosUiLabels" property="WebPosPaymentGiftCardMissingRefNum"/></add-error> <check-errors/> </else> @@ -468,15 +468,15 @@ <log level="always" message="refNumCredit ${parameters.refNumCredit}"/> <if-not-empty field="parameters.refNumCredit"> <set field="idx" from-field="payment"/> - <set field="refNum" from-field="parameters.refNumCredit"/> - <call-object-method obj-field="webPosTransaction" method-name="setPaymentRefNum"> - <field field="idx" type="int"/> - <field field="refNum" type="String"/> - <field field="authCode" type="String"/> - </call-object-method> - <check-errors/> - <log level="info" message="Set the reference number ${idx} to ${refNum} for payment CREDIT CARD"/> - <else> + <set field="refNum" from-field="parameters.refNumCredit"/> + <call-object-method obj-field="webPosTransaction" method-name="setPaymentRefNum"> + <field field="idx" type="int"/> + <field field="refNum" type="String"/> + <field field="authCode" type="String"/> + </call-object-method> + <check-errors/> + <log level="info" message="Set the reference number ${idx} to ${refNum} for payment CREDIT CARD"/> + <else> <set field="payment" from-field="numPayments"/> <add-error><fail-property resource="WebPosUiLabels" property="WebPosPaymentCredictCardMissingRefNum"/></add-error> <check-errors/> Modified: ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/WebPosEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/WebPosEvents.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/WebPosEvents.java (original) +++ ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/WebPosEvents.java Fri Jan 23 03:08:47 2009 @@ -41,7 +41,7 @@ if ("success".equals(responseString)) { HttpSession session = request.getSession(true); - + // get the posTerminalId String posTerminalId = (String) request.getParameter("posTerminalId"); session.removeAttribute("shoppingCart"); @@ -52,13 +52,13 @@ } public static String existsWebPosSession(HttpServletRequest request, HttpServletResponse response) { - String responseString = "success"; - HttpSession session = request.getSession(true); - WebPosSession webPosSession = (WebPosSession) session.getAttribute("webPosSession"); - - if (UtilValidate.isEmpty(webPosSession)) { - responseString = "error"; - } + String responseString = "success"; + HttpSession session = request.getSession(true); + WebPosSession webPosSession = (WebPosSession) session.getAttribute("webPosSession"); + + if (UtilValidate.isEmpty(webPosSession)) { + responseString = "error"; + } return responseString; } public static WebPosSession getWebPosSession(HttpServletRequest request, String posTerminalId) { @@ -89,7 +89,7 @@ } if (UtilValidate.isNotEmpty(posTerminalId)) { - webPosSession = new WebPosSession(posTerminalId, null, userLogin, request.getLocale(), productStoreId, facilityId, currencyUomId, delegator, dispatcher, cart); + webPosSession = new WebPosSession(posTerminalId, null, userLogin, request.getLocale(), productStoreId, facilityId, currencyUomId, delegator, dispatcher, cart); session.setAttribute("webPosSession", webPosSession); } } Modified: ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java (original) +++ ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java Fri Jan 23 03:08:47 2009 @@ -371,7 +371,7 @@ } public BigDecimal processAmount(String amtStr) throws GeneralException { - BigDecimal amount; + BigDecimal amount; if (UtilValidate.isNotEmpty(amtStr)) { try { amount = new BigDecimal(amtStr); @@ -391,7 +391,7 @@ public synchronized void processNoPayment(String paymentMethodTypeId) { try { - BigDecimal amount = processAmount(null); + BigDecimal amount = processAmount(null); Debug.log("Processing [" + paymentMethodTypeId + "] Amount : " + amount, module); // add the payment @@ -408,7 +408,7 @@ } try { - BigDecimal amount = processAmount(amountStr); + BigDecimal amount = processAmount(amountStr); Debug.log("Processing [" + paymentMethodTypeId + "] Amount : " + amount, module); // add the payment @@ -502,8 +502,8 @@ } public BigDecimal getTotalDue() { - BigDecimal grandTotal = this.getGrandTotal(); - BigDecimal paymentAmt = this.getPaymentTotal(); + BigDecimal grandTotal = this.getGrandTotal(); + BigDecimal paymentAmt = this.getPaymentTotal(); return grandTotal.subtract(paymentAmt); } Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/Login.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/Login.groovy?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/Login.groovy (original) +++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/Login.groovy Fri Jan 23 03:08:47 2009 @@ -39,11 +39,11 @@ productStore = ProductStoreWorker.getProductStore(productStoreId, delegator); if (productStore) { - facilityId = productStore.getString("inventoryFacilityId"); + facilityId = productStore.getString("inventoryFacilityId"); - if (facilityId) { - context.posTerminals = delegator.findList("PosTerminal", EntityCondition.makeCondition("facilityId", EntityOperator.EQUALS, facilityId), null, ["posTerminalId"], null, false); - } else { + if (facilityId) { + context.posTerminals = delegator.findList("PosTerminal", EntityCondition.makeCondition("facilityId", EntityOperator.EQUALS, facilityId), null, ["posTerminalId"], null, false); + } else { context.posTerminals = delegator.findList("PosTerminal", null, null, ["posTerminalId"], null, false); - } + } } \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/webpos/widget/WebPosScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/widget/WebPosScreens.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/widget/WebPosScreens.xml (original) +++ ofbiz/trunk/specialpurpose/webpos/widget/WebPosScreens.xml Fri Jan 23 03:08:47 2009 @@ -136,16 +136,16 @@ <script location="component://webpos/webapp/webpos/WEB-INF/actions/cart/ShowCart.groovy"/> </actions> <widgets> - <section> - <condition> - <not><if-empty field-name="shoppingCart"/></not> - </condition> - <widgets> - <container> - <platform-specific><html><html-template location="component://webpos/webapp/webpos/cart/ShowCart.ftl"/></html></platform-specific> - </container> - </widgets> - </section> + <section> + <condition> + <not><if-empty field-name="shoppingCart"/></not> + </condition> + <widgets> + <container> + <platform-specific><html><html-template location="component://webpos/webapp/webpos/cart/ShowCart.ftl"/></html></platform-specific> + </container> + </widgets> + </section> </widgets> </section> </screen> Modified: ofbiz/trunk/specialpurpose/workflow/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/servicedef/services.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/workflow/servicedef/services.xml (original) +++ ofbiz/trunk/specialpurpose/workflow/servicedef/services.xml Fri Jan 23 03:08:47 2009 @@ -54,21 +54,21 @@ </service> <service name="wfCancelWorkflow" engine="java" - location="org.ofbiz.workflow.client.WorkflowServices" invoke="cancelWorkflow"> - <description>Abort a workflow process</description> - <attribute name="workEffortId" type="String" mode="IN"/> + location="org.ofbiz.workflow.client.WorkflowServices" invoke="cancelWorkflow"> + <description>Abort a workflow process</description> + <attribute name="workEffortId" type="String" mode="IN"/> </service> <service name="wfSuspendActivity" engine="java" - location="org.ofbiz.workflow.client.WorkflowServices" invoke="suspendActivity"> - <description>Suspend a workflow activity</description> - <attribute name="workEffortId" type="String" mode="IN"/> + location="org.ofbiz.workflow.client.WorkflowServices" invoke="suspendActivity"> + <description>Suspend a workflow activity</description> + <attribute name="workEffortId" type="String" mode="IN"/> </service> <service name="wfResumeActivity" engine="java" - location="org.ofbiz.workflow.client.WorkflowServices" invoke="resumeActivity"> - <description>Resume a suspended activity</description> - <attribute name="workEffortId" type="String" mode="IN"/> + location="org.ofbiz.workflow.client.WorkflowServices" invoke="resumeActivity"> + <description>Resume a suspended activity</description> + <attribute name="workEffortId" type="String" mode="IN"/> </service> <service name="wfChangeActivityState" engine="java" @@ -78,8 +78,8 @@ <attribute name="newState" type="String" mode="IN"/> </service> - <service name="wfAssignmentInterface" engine="interface" location="" invoke=""> - <description>Interface service for workflow assignment services</description> + <service name="wfAssignmentInterface" engine="interface" location="" invoke=""> + <description>Interface service for workflow assignment services</description> <attribute name="workEffortId" type="String" mode="IN"/> <attribute name="partyId" type="String" mode="IN"/> <attribute name="roleTypeId" type="String" mode="IN" optional="true"/> @@ -113,29 +113,29 @@ </service> <service name="wfDelegateAssignmentInterface" engine="interface" location="" invoke=""> - <description>Interface service for assignment delegation services</description> - <attribute name="workEffortId" type="String" mode="IN"/> - <attribute name="fromPartyId" type="String" mode="IN"/> - <attribute name="fromRoleTypeId" type="String" mode="IN"/> - <attribute name="fromFromDate" type="Timestamp" mode="IN"/> - <attribute name="toPartyId" type="String" mode="IN"/> - <attribute name="toRoleTypeId" type="String" mode="IN"/> - <attribute name="toFromDate" type="Timestamp" mode="IN" optional="true"/> + <description>Interface service for assignment delegation services</description> + <attribute name="workEffortId" type="String" mode="IN"/> + <attribute name="fromPartyId" type="String" mode="IN"/> + <attribute name="fromRoleTypeId" type="String" mode="IN"/> + <attribute name="fromFromDate" type="Timestamp" mode="IN"/> + <attribute name="toPartyId" type="String" mode="IN"/> + <attribute name="toRoleTypeId" type="String" mode="IN"/> + <attribute name="toFromDate" type="Timestamp" mode="IN" optional="true"/> </service> <service name="wfDelegateAssignment" engine="java" - location="org.ofbiz.workflow.client.WorkflowServices" invoke="delegateAssignment"> - <description>Delegate an assigned assignment to another party</description> - <implements service="wfDelegateAssignmentInterface"/> + location="org.ofbiz.workflow.client.WorkflowServices" invoke="delegateAssignment"> + <description>Delegate an assigned assignment to another party</description> + <implements service="wfDelegateAssignmentInterface"/> </service> <service name="wfDelegateAndAcceptAssignmet" engine="java" - location="org.ofbiz.workflow.client.WorkflowServices" invoke="delegateAcceptAssignment"> - <description>Delegate an assigned assignment and accept</description> - <implements service="wfDelegateAssignmentInterface"/> - <attribute name="startActivity" type="Boolean" mode="IN" optional="true"/> + location="org.ofbiz.workflow.client.WorkflowServices" invoke="delegateAcceptAssignment"> + <description>Delegate an assigned assignment and accept</description> + <implements service="wfDelegateAssignmentInterface"/> + <attribute name="startActivity" type="Boolean" mode="IN" optional="true"/> </service> - + <service name="wfActivateApplication" engine="java" location="org.ofbiz.workflow.WfApplicationServices" invoke="activateApplication"> <description>Activate a workflow assignment</description> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |