svn commit: r737003 [8/11] - in /ofbiz/trunk: ./ applications/accounting/entity
Locked
svn commit: r737003 [8/11] - in /ofbiz/trunk: ./ applications/accounting/entity
 
|
Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml Fri Jan 23 03:08:47 2009 @@ -81,34 +81,34 @@ <widgets> <decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="lefthalf"> - <screenlet title="${uiLabelMap.OrderRequest} ${custRequest.custRequestId} ${uiLabelMap.CommonInformation}"> - <include-form name="requestInfo" location="component://order/webapp/ordermgr/request/RequestForms.xml"/> - </screenlet> + <container style="lefthalf"> + <screenlet title="${uiLabelMap.OrderRequest} ${custRequest.custRequestId} ${uiLabelMap.CommonInformation}"> + <include-form name="requestInfo" location="component://order/webapp/ordermgr/request/RequestForms.xml"/> + </screenlet> <screenlet title="${uiLabelMap.PageTitleRequestItems}"> <include-form name="OverviewRequestItems" location="component://order/webapp/ordermgr/request/RequestForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.PageTitleRequestItemNotes}"> <include-form name="ListRequestItemNotes" location="component://order/webapp/ordermgr/request/RequestForms.xml"/> </screenlet> - </container> - <container style="righthalf"> - <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/request/requestContactMech.ftl"/></html> - </platform-specific> - <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/request/requestRoles.ftl"/></html> - </platform-specific> + </container> + <container style="righthalf"> + <platform-specific> + <html><html-template location="component://order/webapp/ordermgr/request/requestContactMech.ftl"/></html> + </platform-specific> + <platform-specific> + <html><html-template location="component://order/webapp/ordermgr/request/requestRoles.ftl"/></html> + </platform-specific> <screenlet title="${uiLabelMap.PartyListCommunicationEvents}" navigation-form-name="ViewRequestCommunicationEvents"> <include-form name="ViewRequestCommunicationEvents" location="component://order/webapp/ordermgr/request/RequestForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.WorkEffortWorkEfforts}" navigation-form-name="ViewRequestWorkEfforts"> <include-form name="ViewRequestWorkEfforts" location="component://order/webapp/ordermgr/request/RequestForms.xml"/> </screenlet> - <screenlet title="${uiLabelMap.CommonContent}" navigation-form-name="ListCustRequestContent"> - <include-form name="ListCustRequestContent" location="component://order/webapp/ordermgr/request/RequestForms.xml"/> - </screenlet> - </container> + <screenlet title="${uiLabelMap.CommonContent}" navigation-form-name="ListCustRequestContent"> + <include-form name="ListCustRequestContent" location="component://order/webapp/ordermgr/request/RequestForms.xml"/> + </screenlet> + </container> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyPermissionServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyPermissionServices.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyPermissionServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyPermissionServices.xml Fri Jan 23 03:08:47 2009 @@ -251,29 +251,29 @@ <call-simple-method method-name="basePermissionCheck"/> </then> <else-if> - <condition> - <and> - <if-compare operator="equals" value="COMMENT_NOTE" field="parameters.communicationEventTypeId"/> - <if-compare operator="equals" value="CREATE" field="action"/> - </and> - </condition> - <then> - <set field="altPermission" value="PARTYMGR_CME-NOTE"/> - <call-simple-method method-name="basePermissionCheck"/> - </then> + <condition> + <and> + <if-compare operator="equals" value="COMMENT_NOTE" field="parameters.communicationEventTypeId"/> + <if-compare operator="equals" value="CREATE" field="action"/> + </and> + </condition> + <then> + <set field="altPermission" value="PARTYMGR_CME-NOTE"/> + <call-simple-method method-name="basePermissionCheck"/> + </then> </else-if> <else-if> - <condition> - <and> - <if-compare-field field="parameters.partyIdFrom" to-field="userLogin.partyId" operator="not-equals"/> - <if-compare-field field="parameters.partyIdTo" to-field="userLogin.partyId" operator="not-equals"/> - <if-compare-field field="parameters.partyId" to-field="userLogin.partyId" operator="not-equals"/><!-- update role --> - </and> - </condition> - <then> - <set field="altPermission" value="PARTYMGR_CME"/> - <call-simple-method method-name="basePermissionCheck"/> - </then> + <condition> + <and> + <if-compare-field field="parameters.partyIdFrom" to-field="userLogin.partyId" operator="not-equals"/> + <if-compare-field field="parameters.partyIdTo" to-field="userLogin.partyId" operator="not-equals"/> + <if-compare-field field="parameters.partyId" to-field="userLogin.partyId" operator="not-equals"/><!-- update role --> + </and> + </condition> + <then> + <set field="altPermission" value="PARTYMGR_CME"/> + <call-simple-method method-name="basePermissionCheck"/> + </then> </else-if> <else> <set field="hasPermission" type="Boolean" value="true"/> Modified: ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java (original) +++ ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java Fri Jan 23 03:08:47 2009 @@ -77,10 +77,10 @@ // assign some default values because required by sendmail and better not make them defaults over there if (UtilValidate.isEmpty(communicationEvent.getString("subject"))) { - communicationEvent.put("subject", " "); + communicationEvent.put("subject", " "); } if (UtilValidate.isEmpty(communicationEvent.getString("content"))) { - communicationEvent.put("content", " "); + communicationEvent.put("content", " "); } // prepare the email Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/PrepCommEventForward.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/PrepCommEventForward.groovy?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/PrepCommEventForward.groovy (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/PrepCommEventForward.groovy Fri Jan 23 03:08:47 2009 @@ -44,18 +44,18 @@ " > Date: " + originalEvent.entryDate + "\n >"; bodycontent = originalEvent.content.toString(); if (bodycontent) { - int ix = -1; - body = ""; - if (bodycontent.indexOf('\n') != -1){ - while ((ix = bodycontent.indexOf('\n')) != -1) { - bodycontent = bodycontent.replace('\n',' > '); - if (bodycontent != body){ - body = body + bodycontent; - } - } - }else{ - body = bodycontent; - } + int ix = -1; + body = ""; + if (bodycontent.indexOf('\n') != -1){ + while ((ix = bodycontent.indexOf('\n')) != -1) { + bodycontent = bodycontent.replace('\n',' > '); + if (bodycontent != body){ + body = body + bodycontent; + } + } + }else{ + body = bodycontent; + } } parameters.content = headcontent + "\n > " + body; } Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/FindLookUp.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/FindLookUp.groovy?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/FindLookUp.groovy (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/FindLookUp.groovy Fri Jan 23 03:08:47 2009 @@ -21,13 +21,13 @@ import org.ofbiz.entity.condition.*; if (context.noConditionFind == null) { - context.noConditionFind = parameters.noConditionFind; + context.noConditionFind = parameters.noConditionFind; } if (context.noConditionFind == null) { - context.noConditionFind = UtilProperties.getPropertyValue("widget", "widget.defaultNoConditionFind"); + context.noConditionFind = UtilProperties.getPropertyValue("widget", "widget.defaultNoConditionFind"); } if (context.filterByDate == null) { - context.filterByDate = parameters.filterByDate; + context.filterByDate = parameters.filterByDate; } prepareResult = dispatcher.runSync("prepareFind", [entityName : context.entityName, orderBy : context.orderBy, @@ -43,19 +43,19 @@ statusPartyDisable = EntityCondition.makeCondition([CondList1, CondList], EntityOperator.OR); entityConditionList = null; if (prepareResult.entityConditionList != null) { - ConditionList = [ prepareResult.entityConditionList, statusPartyDisable ]; - entityConditionList = EntityCondition.makeCondition(ConditionList); + ConditionList = [ prepareResult.entityConditionList, statusPartyDisable ]; + entityConditionList = EntityCondition.makeCondition(ConditionList); } else if (context.noConditionFind == "Y") { - entityConditionList = statusPartyDisable; + entityConditionList = statusPartyDisable; } - + executeResult = dispatcher.runSync("executeFind", [entityName : context.entityName, orderByList : prepareResult.orderByList, entityConditionList : entityConditionList, noConditionFind :context.noConditionFind ] ); if (executeResult.listIt == null) { - Debug.log("No list found for query string + [" + prepareResult.queryString + "]"); + Debug.log("No list found for query string + [" + prepareResult.queryString + "]"); } context.listIt = executeResult.listIt; context.queryString = prepareResult.queryString; Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GetMyCompany.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GetMyCompany.groovy?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GetMyCompany.groovy (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GetMyCompany.groovy Fri Jan 23 03:08:47 2009 @@ -18,14 +18,14 @@ */ if (userLogin) { - companies = delegator.findByAnd("PartyRelationship", - [partyIdTo: userLogin.partyId, - roleTypeIdTo: "CONTACT", - roleTypeIdFrom: "ACCOUNT"]); - if (companies) { - company = companies[0]; - context.myCompanyId = company.partyIdFrom; - } else { - context.myCompanyId = userLogin.partyId; - } + companies = delegator.findByAnd("PartyRelationship", + [partyIdTo: userLogin.partyId, + roleTypeIdTo: "CONTACT", + roleTypeIdFrom: "ACCOUNT"]); + if (companies) { + company = companies[0]; + context.myCompanyId = company.partyIdFrom; + } else { + context.myCompanyId = userLogin.partyId; + } } \ No newline at end of file Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy Fri Jan 23 03:08:47 2009 @@ -29,103 +29,103 @@ Boolean actualCurrency = new Boolean(context.actualCurrency); if (actualCurrency == null) { - actualCurrency = true; + actualCurrency = true; } actualCurrencyUomId = context.actualCurrencyUomId; if (!actualCurrencyUomId) { - actualCurrencyUomId = context.defaultOrganizationPartyCurrencyUomId; + actualCurrencyUomId = context.defaultOrganizationPartyCurrencyUomId; } findOpts = new EntityFindOptions(true, EntityFindOptions.TYPE_SCROLL_INSENSITIVE, EntityFindOptions.CONCUR_READ_ONLY, true); //get total/unapplied/applied invoices separated by sales/purch amount: -totalInvSaApplied = BigDecimal.ZERO; -totalInvSaNotApplied = BigDecimal.ZERO; -totalInvPuApplied = BigDecimal.ZERO; -totalInvPuNotApplied = BigDecimal.ZERO; +totalInvSaApplied = BigDecimal.ZERO; +totalInvSaNotApplied = BigDecimal.ZERO; +totalInvPuApplied = BigDecimal.ZERO; +totalInvPuNotApplied = BigDecimal.ZERO; invExprs = - EntityCondition.makeCondition([ - EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "INVOICE_IN_PROCESS"), - EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "INVOICE_WRITEOFF"), - EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "INVOICE_CANCELLED"), - EntityCondition.makeCondition([ - EntityCondition.makeCondition([ - EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, parameters.partyId), - EntityCondition.makeCondition("partyIdFrom", EntityOperator.EQUALS, context.defaultOrganizationPartyId) - ],EntityOperator.AND), - EntityCondition.makeCondition([ - EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, context.defaultOrganizationPartyId), - EntityCondition.makeCondition("partyIdFrom", EntityOperator.EQUALS, parameters.partyId) - ],EntityOperator.AND) - ],EntityOperator.OR) - ],EntityOperator.AND); - + EntityCondition.makeCondition([ + EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "INVOICE_IN_PROCESS"), + EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "INVOICE_WRITEOFF"), + EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "INVOICE_CANCELLED"), + EntityCondition.makeCondition([ + EntityCondition.makeCondition([ + EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, parameters.partyId), + EntityCondition.makeCondition("partyIdFrom", EntityOperator.EQUALS, context.defaultOrganizationPartyId) + ],EntityOperator.AND), + EntityCondition.makeCondition([ + EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, context.defaultOrganizationPartyId), + EntityCondition.makeCondition("partyIdFrom", EntityOperator.EQUALS, parameters.partyId) + ],EntityOperator.AND) + ],EntityOperator.OR) + ],EntityOperator.AND); + invIterator = delegator.find("InvoiceAndType", invExprs, null, null, null, findOpts); while (invoice = invIterator.next()) { - if ("PURCHASE_INVOICE".equals(invoice.parentTypeId)) { - totalInvPuApplied += InvoiceWorker.getInvoiceAppliedBd(invoice, actualCurrency).setScale(2,BigDecimal.ROUND_HALF_UP); - totalInvPuNotApplied += InvoiceWorker.getInvoiceNotApplied(invoice, actualCurrency).setScale(2,BigDecimal.ROUND_HALF_UP); - } - else if ("SALES_INVOICE".equals(invoice.parentTypeId)) { - totalInvSaApplied += InvoiceWorker.getInvoiceAppliedBd(invoice, actualCurrency).setScale(2,BigDecimal.ROUND_HALF_UP); - totalInvSaNotApplied += InvoiceWorker.getInvoiceNotApplied(invoice, actualCurrency).setScale(2,BigDecimal.ROUND_HALF_UP); - } - else { - Debug.logError("InvoiceType: " + invoice.invoiceTypeId + " without a valid parentTypeId: " + invoice.parentTypeId + " !!!! Should be either PURCHASE_INVOICE or SALES_INVOICE", ""); - } + if ("PURCHASE_INVOICE".equals(invoice.parentTypeId)) { + totalInvPuApplied += InvoiceWorker.getInvoiceAppliedBd(invoice, actualCurrency).setScale(2,BigDecimal.ROUND_HALF_UP); + totalInvPuNotApplied += InvoiceWorker.getInvoiceNotApplied(invoice, actualCurrency).setScale(2,BigDecimal.ROUND_HALF_UP); + } + else if ("SALES_INVOICE".equals(invoice.parentTypeId)) { + totalInvSaApplied += InvoiceWorker.getInvoiceAppliedBd(invoice, actualCurrency).setScale(2,BigDecimal.ROUND_HALF_UP); + totalInvSaNotApplied += InvoiceWorker.getInvoiceNotApplied(invoice, actualCurrency).setScale(2,BigDecimal.ROUND_HALF_UP); + } + else { + Debug.logError("InvoiceType: " + invoice.invoiceTypeId + " without a valid parentTypeId: " + invoice.parentTypeId + " !!!! Should be either PURCHASE_INVOICE or SALES_INVOICE", ""); + } } invIterator.close(); - + //get total/unapplied/applied payment in/out total amount: -totalPayInApplied = BigDecimal.ZERO; -totalPayInNotApplied = BigDecimal.ZERO; -totalPayOutApplied = BigDecimal.ZERO; -totalPayOutNotApplied = BigDecimal.ZERO; - +totalPayInApplied = BigDecimal.ZERO; +totalPayInNotApplied = BigDecimal.ZERO; +totalPayOutApplied = BigDecimal.ZERO; +totalPayOutNotApplied = BigDecimal.ZERO; + payExprs = EntityCondition.makeCondition([ - EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "PMNT_NOTPAID"), - EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "PMNT_CANCELLED"), - EntityCondition.makeCondition([ - EntityCondition.makeCondition([ - EntityCondition.makeCondition("partyIdTo", EntityOperator.EQUALS, parameters.partyId), - EntityCondition.makeCondition("partyIdFrom", EntityOperator.EQUALS, context.defaultOrganizationPartyId) - ], EntityOperator.AND), - EntityCondition.makeCondition([ - EntityCondition.makeCondition("partyIdTo", EntityOperator.EQUALS, context.defaultOrganizationPartyId), - EntityCondition.makeCondition("partyIdFrom", EntityOperator.EQUALS, parameters.partyId) - ], EntityOperator.AND) - ], EntityOperator.OR) - ], EntityOperator.AND); + EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "PMNT_NOTPAID"), + EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "PMNT_CANCELLED"), + EntityCondition.makeCondition([ + EntityCondition.makeCondition([ + EntityCondition.makeCondition("partyIdTo", EntityOperator.EQUALS, parameters.partyId), + EntityCondition.makeCondition("partyIdFrom", EntityOperator.EQUALS, context.defaultOrganizationPartyId) + ], EntityOperator.AND), + EntityCondition.makeCondition([ + EntityCondition.makeCondition("partyIdTo", EntityOperator.EQUALS, context.defaultOrganizationPartyId), + EntityCondition.makeCondition("partyIdFrom", EntityOperator.EQUALS, parameters.partyId) + ], EntityOperator.AND) + ], EntityOperator.OR) + ], EntityOperator.AND); payIterator = delegator.find("PaymentAndType", payExprs, null, null, null, findOpts); while (payment = payIterator.next()) { - if ("DISBURSEMENT".equals(payment.parentTypeId) || "TAX_PAYMENT".equals(payment.parentTypeId)) { - totalPayOutApplied += PaymentWorker.getPaymentAppliedBd(payment, actualCurrency).setScale(2,BigDecimal.ROUND_HALF_UP); - totalPayOutNotApplied += PaymentWorker.getPaymentNotAppliedBd(payment, actualCurrency).setScale(2,BigDecimal.ROUND_HALF_UP); - } - else if ("RECEIPT".equals(payment.parentTypeId)) { - totalPayInApplied += PaymentWorker.getPaymentAppliedBd(payment, actualCurrency).setScale(2,BigDecimal.ROUND_HALF_UP); - totalPayInNotApplied += PaymentWorker.getPaymentNotAppliedBd(payment, actualCurrency).setScale(2,BigDecimal.ROUND_HALF_UP); - } - else { - Debug.logError("PaymentTypeId: " + payment.paymentTypeId + " without a valid parentTypeId: " + payment.parentTypeId + " !!!! Should be either DISBURSEMENT, TAX_PAYMENT or RECEIPT", ""); - } + if ("DISBURSEMENT".equals(payment.parentTypeId) || "TAX_PAYMENT".equals(payment.parentTypeId)) { + totalPayOutApplied += PaymentWorker.getPaymentAppliedBd(payment, actualCurrency).setScale(2,BigDecimal.ROUND_HALF_UP); + totalPayOutNotApplied += PaymentWorker.getPaymentNotAppliedBd(payment, actualCurrency).setScale(2,BigDecimal.ROUND_HALF_UP); + } + else if ("RECEIPT".equals(payment.parentTypeId)) { + totalPayInApplied += PaymentWorker.getPaymentAppliedBd(payment, actualCurrency).setScale(2,BigDecimal.ROUND_HALF_UP); + totalPayInNotApplied += PaymentWorker.getPaymentNotAppliedBd(payment, actualCurrency).setScale(2,BigDecimal.ROUND_HALF_UP); + } + else { + Debug.logError("PaymentTypeId: " + payment.paymentTypeId + " without a valid parentTypeId: " + payment.parentTypeId + " !!!! Should be either DISBURSEMENT, TAX_PAYMENT or RECEIPT", ""); + } } payIterator.close(); context.finanSummary = FastMap.newInstance(); -context.finanSummary.totalSalesInvoice = totalInvSaApplied.add(totalInvSaNotApplied); -context.finanSummary.totalPurchaseInvoice = totalInvPuApplied.add(totalInvPuNotApplied); -context.finanSummary.totalPaymentsIn = totalPayInApplied.add(totalPayInNotApplied); -context.finanSummary.totalPaymentsOut = totalPayOutApplied.add(totalPayOutNotApplied); +context.finanSummary.totalSalesInvoice = totalInvSaApplied.add(totalInvSaNotApplied); +context.finanSummary.totalPurchaseInvoice = totalInvPuApplied.add(totalInvPuNotApplied); +context.finanSummary.totalPaymentsIn = totalPayInApplied.add(totalPayInNotApplied); +context.finanSummary.totalPaymentsOut = totalPayOutApplied.add(totalPayOutNotApplied); context.finanSummary.totalInvoiceNotApplied = totalInvSaNotApplied.subtract(totalInvPuNotApplied); context.finanSummary.totalPaymentNotApplied = totalPayInNotApplied.subtract(totalPayOutNotApplied); transferAmount = totalInvSaApplied.add(totalInvSaNotApplied).subtract(totalInvPuApplied.add(totalInvPuNotApplied)).subtract(totalPayInApplied.add(totalPayInNotApplied).add(totalPayOutApplied.add(totalPayOutNotApplied))); if (transferAmount.signum() == -1) { - context.finanSummary.totalToBePaid = transferAmount.negate(); + context.finanSummary.totalToBePaid = transferAmount.negate(); } else { - context.finanSummary.totalToBeReceived = transferAmount; + context.finanSummary.totalToBeReceived = transferAmount; } - + Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/SetRoleVars.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/SetRoleVars.groovy?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/SetRoleVars.groovy (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/SetRoleVars.groovy Fri Jan 23 03:08:47 2009 @@ -21,28 +21,28 @@ roleTypeAndParty = delegator.findByAnd("RoleTypeAndParty", ['partyId': parameters.partyId, 'roleTypeId': 'ACCOUNT']); if (roleTypeAndParty) { - context.accountDescription = roleTypeAndParty[0].description; + context.accountDescription = roleTypeAndParty[0].description; } roleTypeAndParty = delegator.findByAnd("RoleTypeAndParty", ['partyId': parameters.partyId, 'roleTypeId': 'CONTACT']); if (roleTypeAndParty) { - context.contactDescription = roleTypeAndParty.get(0).description; + context.contactDescription = roleTypeAndParty.get(0).description; } roleTypeAndParty = delegator.findByAnd("RoleTypeAndParty", ['partyId': parameters.partyId, 'roleTypeId': 'LEAD']); if (roleTypeAndParty) { - context.leadDescription = roleTypeAndParty.get(0).description; - partyRelationships = EntityUtil.filterByDate(delegator.findByAnd("PartyRelationship", ["partyIdTo": parameters.partyId, "roleTypeIdFrom": "ACCOUNT_LEAD", "roleTypeIdTo": "LEAD", "partyRelationshipTypeId": "EMPLOYMENT"])); - if (partyRelationships) { - context.partyGroupId = partyRelationships.get(0).partyIdFrom; - context.partyId = parameters.partyId; - } + context.leadDescription = roleTypeAndParty.get(0).description; + partyRelationships = EntityUtil.filterByDate(delegator.findByAnd("PartyRelationship", ["partyIdTo": parameters.partyId, "roleTypeIdFrom": "ACCOUNT_LEAD", "roleTypeIdTo": "LEAD", "partyRelationshipTypeId": "EMPLOYMENT"])); + if (partyRelationships) { + context.partyGroupId = partyRelationships.get(0).partyIdFrom; + context.partyId = parameters.partyId; + } } roleTypeAndParty = delegator.findByAnd("RoleTypeAndParty", ['partyId': parameters.partyId, 'roleTypeId': 'ACCOUNT_LEAD']); if (roleTypeAndParty) { - context.leadDescription = roleTypeAndParty.get(0).description; - partyRelationships = EntityUtil.filterByDate(delegator.findByAnd("PartyRelationship", ["partyIdFrom": parameters.partyId, "roleTypeIdFrom": "ACCOUNT_LEAD", "roleTypeIdTo": "LEAD", "partyRelationshipTypeId": "EMPLOYMENT"])); - if (partyRelationships) { - context.partyGroupId = parameters.partyId; - context.partyId = partyRelationships.get(0).partyIdTo; - } + context.leadDescription = roleTypeAndParty.get(0).description; + partyRelationships = EntityUtil.filterByDate(delegator.findByAnd("PartyRelationship", ["partyIdFrom": parameters.partyId, "roleTypeIdFrom": "ACCOUNT_LEAD", "roleTypeIdTo": "LEAD", "partyRelationshipTypeId": "EMPLOYMENT"])); + if (partyRelationships) { + context.partyGroupId = parameters.partyId; + context.partyId = partyRelationships.get(0).partyIdTo; + } } Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/UnAppliedInvoicesForParty.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/UnAppliedInvoicesForParty.groovy?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/UnAppliedInvoicesForParty.groovy (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/UnAppliedInvoicesForParty.groovy Fri Jan 23 03:08:47 2009 @@ -29,45 +29,45 @@ Boolean actualCurrency = new Boolean(context.actualCurrency); if (actualCurrency == null) { - actualCurrency = true; + actualCurrency = true; } findOpts = new EntityFindOptions(true, EntityFindOptions.TYPE_SCROLL_INSENSITIVE, EntityFindOptions.CONCUR_READ_ONLY, true); - + invExprs = - EntityCondition.makeCondition([ - EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "INVOICE_IN_PROCESS"), - EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "INVOICE_WRITEOFF"), - EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "INVOICE_CANCELLED"), - EntityCondition.makeCondition([ - EntityCondition.makeCondition([ - EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, parameters.partyId), - EntityCondition.makeCondition("partyIdFrom", EntityOperator.EQUALS, context.defaultOrganizationPartyId) - ],EntityOperator.AND), - EntityCondition.makeCondition([ - EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, context.defaultOrganizationPartyId), - EntityCondition.makeCondition("partyIdFrom", EntityOperator.EQUALS, parameters.partyId) - ],EntityOperator.AND) - ],EntityOperator.OR) - ],EntityOperator.AND); - + EntityCondition.makeCondition([ + EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "INVOICE_IN_PROCESS"), + EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "INVOICE_WRITEOFF"), + EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "INVOICE_CANCELLED"), + EntityCondition.makeCondition([ + EntityCondition.makeCondition([ + EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, parameters.partyId), + EntityCondition.makeCondition("partyIdFrom", EntityOperator.EQUALS, context.defaultOrganizationPartyId) + ],EntityOperator.AND), + EntityCondition.makeCondition([ + EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, context.defaultOrganizationPartyId), + EntityCondition.makeCondition("partyIdFrom", EntityOperator.EQUALS, parameters.partyId) + ],EntityOperator.AND) + ],EntityOperator.OR) + ],EntityOperator.AND); + invIterator = delegator.find("InvoiceAndType", invExprs, null, null, null, findOpts); invoiceList = []; while (invoice = invIterator.next()) { - unAppliedAmount = InvoiceWorker.getInvoiceNotApplied(invoice, actualCurrency).setScale(2,BigDecimal.ROUND_HALF_UP); - if (unAppliedAmount.signum() == 1) { - if (actualCurrency.equals(true)) { + unAppliedAmount = InvoiceWorker.getInvoiceNotApplied(invoice, actualCurrency).setScale(2,BigDecimal.ROUND_HALF_UP); + if (unAppliedAmount.signum() == 1) { + if (actualCurrency.equals(true)) { invoiceCurrencyUomId = invoice.currencyUomId; - } else { + } else { invoiceCurrencyUomId = context.defaultOrganizationPartyCurrencyUomId; - } - invoiceList.add([invoiceId : invoice.invoiceId, - invoiceDate : invoice.invoiceDate, - unAppliedAmount : unAppliedAmount, - invoiceCurrencyUomId : invoiceCurrencyUomId, - amount : InvoiceWorker.getInvoiceTotalBd(invoice, actualCurrency).setScale(2,BigDecimal.ROUND_HALF_UP), - invoiceTypeId : invoice.invoiceTypeId, - invoiceParentTypeId : invoice.parentTypeId]); - } + } + invoiceList.add([invoiceId : invoice.invoiceId, + invoiceDate : invoice.invoiceDate, + unAppliedAmount : unAppliedAmount, + invoiceCurrencyUomId : invoiceCurrencyUomId, + amount : InvoiceWorker.getInvoiceTotalBd(invoice, actualCurrency).setScale(2,BigDecimal.ROUND_HALF_UP), + invoiceTypeId : invoice.invoiceTypeId, + invoiceParentTypeId : invoice.parentTypeId]); + } } invIterator.close(); Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/UnAppliedPaymentsForParty.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/UnAppliedPaymentsForParty.groovy?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/UnAppliedPaymentsForParty.groovy (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/UnAppliedPaymentsForParty.groovy Fri Jan 23 03:08:47 2009 @@ -29,47 +29,47 @@ Boolean actualCurrency = new Boolean(context.actualCurrency); if (actualCurrency == null) { - actualCurrency = true; + actualCurrency = true; } findOpts = new EntityFindOptions(true, EntityFindOptions.TYPE_SCROLL_INSENSITIVE, EntityFindOptions.CONCUR_READ_ONLY, true); - + payExprs = EntityCondition.makeCondition([ - EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "PMNT_NOTPAID"), - EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "PMNT_CANCELLED"), - EntityCondition.makeCondition([ - EntityCondition.makeCondition([ - EntityCondition.makeCondition("partyIdTo", EntityOperator.EQUALS, parameters.partyId), - EntityCondition.makeCondition("partyIdFrom", EntityOperator.EQUALS, context.defaultOrganizationPartyId) - ], EntityOperator.AND), - EntityCondition.makeCondition([ - EntityCondition.makeCondition("partyIdTo", EntityOperator.EQUALS, context.defaultOrganizationPartyId), - EntityCondition.makeCondition("partyIdFrom", EntityOperator.EQUALS, parameters.partyId) - ], EntityOperator.AND) - ], EntityOperator.OR) - ], EntityOperator.AND); + EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "PMNT_NOTPAID"), + EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "PMNT_CANCELLED"), + EntityCondition.makeCondition([ + EntityCondition.makeCondition([ + EntityCondition.makeCondition("partyIdTo", EntityOperator.EQUALS, parameters.partyId), + EntityCondition.makeCondition("partyIdFrom", EntityOperator.EQUALS, context.defaultOrganizationPartyId) + ], EntityOperator.AND), + EntityCondition.makeCondition([ + EntityCondition.makeCondition("partyIdTo", EntityOperator.EQUALS, context.defaultOrganizationPartyId), + EntityCondition.makeCondition("partyIdFrom", EntityOperator.EQUALS, parameters.partyId) + ], EntityOperator.AND) + ], EntityOperator.OR) + ], EntityOperator.AND); paymentList = []; payIterator = delegator.find("PaymentAndType", payExprs, null, null, null, findOpts); while (payment = payIterator.next()) { - unAppliedAmount = PaymentWorker.getPaymentNotAppliedBd(payment, actualCurrency).setScale(2,BigDecimal.ROUND_HALF_UP); - if (unAppliedAmount.signum() == 1) { - if (actualCurrency.equals(true) && payment.actualCurrencyAmount && payment.actualCurrencyUomId) { - amount = payment.actualCurrencyAmount; - paymentCurrencyUomId = payment.actualCurrencyUomId; - } else { - amount = payment.amount; - paymentCurrencyUomId = payment.currencyUomId; - } - paymentList.add([paymentId : payment.paymentId, - effectiveDate : payment.effectiveDate, - unAppliedAmount : unAppliedAmount, - amount : amount, - paymentCurrencyUomId : paymentCurrencyUomId, - paymentTypeId : payment.paymentTypeId, - paymentParentTypeId : payment.parentTypeId]); - } + unAppliedAmount = PaymentWorker.getPaymentNotAppliedBd(payment, actualCurrency).setScale(2,BigDecimal.ROUND_HALF_UP); + if (unAppliedAmount.signum() == 1) { + if (actualCurrency.equals(true) && payment.actualCurrencyAmount && payment.actualCurrencyUomId) { + amount = payment.actualCurrencyAmount; + paymentCurrencyUomId = payment.actualCurrencyUomId; + } else { + amount = payment.amount; + paymentCurrencyUomId = payment.currencyUomId; + } + paymentList.add([paymentId : payment.paymentId, + effectiveDate : payment.effectiveDate, + unAppliedAmount : unAppliedAmount, + amount : amount, + paymentCurrencyUomId : paymentCurrencyUomId, + paymentTypeId : payment.paymentTypeId, + paymentParentTypeId : payment.parentTypeId]); + } } payIterator.close(); Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Fri Jan 23 03:08:47 2009 @@ -728,7 +728,7 @@ <request-map uri="listUnknownPartyComms"> <security https="true" auth="true" /> <response name="success" type="view" value="ListUnknownPartyComms" /> - </request-map> + </request-map> <request-map uri="editRequestFromCommEvent"> <security https="true" auth="true" /> <response name="success" type="view" value="EditRequestFromCommEvent" /> Modified: ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Fri Jan 23 03:08:47 2009 @@ -623,35 +623,35 @@ <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit/></field> </form> - <form name="ListMyUnknownPartyEmails" type="multi" use-row-submit="true" - title="Email List unknown parties" list-name="commEventsUnknown" - target="deleteCommunicationEvents?donePage=${parameters.donePage}" default-entity-name="CommunicationEvent" + <form name="ListMyUnknownPartyEmails" type="multi" use-row-submit="true" + title="Email List unknown parties" list-name="commEventsUnknown" + target="deleteCommunicationEvents?donePage=${parameters.donePage}" default-entity-name="CommunicationEvent" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <row-actions> <set field="subject" from-field="subject" default-value="${uiLabelMap.PartyNoSubject}"/> </row-actions> <field name="delContentDataResource"><hidden value="Y"/></field> - <field name="communicationEventId"> - <hidden /> - </field> - <field name="subject" widget-style="buttontext" - widget-area-style="fieldWidth300"> - <hyperlink description="${subject}" - target="ViewCommunicationEvent?communicationEventId=${communicationEventId}" /> - </field> - <field name="entryDate"> - <display description="${date:dateTimeStr(entryDate, timeZone, locale)}" /> - </field> - <field name="note" widget-area-style="fieldWidth200"> - <display /> - </field> - <field name="_rowSubmit" title="S"> - <check /> - </field> - <field name="deleteSelectedButton" widget-style="smallSubmit"> - <submit /> - </field> - </form> + <field name="communicationEventId"> + <hidden /> + </field> + <field name="subject" widget-style="buttontext" + widget-area-style="fieldWidth300"> + <hyperlink description="${subject}" + target="ViewCommunicationEvent?communicationEventId=${communicationEventId}" /> + </field> + <field name="entryDate"> + <display description="${date:dateTimeStr(entryDate, timeZone, locale)}" /> + </field> + <field name="note" widget-area-style="fieldWidth200"> + <display /> + </field> + <field name="_rowSubmit" title="S"> + <check /> + </field> + <field name="deleteSelectedButton" widget-style="smallSubmit"> + <submit /> + </field> + </form> <form name="allocateMsgToPartyForm" type="single" target="allocateMsgToParty" title="create a new party for a unknown incoming email address"> <actions> Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Fri Jan 23 03:08:47 2009 @@ -162,29 +162,29 @@ </widgets> </section> </screen> - <screen name="ViewCommunicationEvent"> - <section> - <actions> - <set field="titleProperty" value="PageTitleViewCommunication" /> - <set field="tabButtonItem" value="OverView" /> - <set field="parentCommEventId" from-field="parameters.parentCommEventId" /> - <entity-one entity-name="CommunicationEvent" value-name="communicationEvent" /> - </actions> - <widgets> - <decorator-screen name="CommonCommunicationEventDecorator" - location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <container style="lefthalf"> - <section> - <widgets> - <label style="h1" - text="Communication Event id: ${parameters.communicationEventId}"></label> - <include-screen name="commEvent" /> - </widgets> - </section> - </container> - <container style="righthalf"> - <label style="h1" text="${uiLabelMap.CommonRelatedInformation}" /> + <screen name="ViewCommunicationEvent"> + <section> + <actions> + <set field="titleProperty" value="PageTitleViewCommunication" /> + <set field="tabButtonItem" value="OverView" /> + <set field="parentCommEventId" from-field="parameters.parentCommEventId" /> + <entity-one entity-name="CommunicationEvent" value-name="communicationEvent" /> + </actions> + <widgets> + <decorator-screen name="CommonCommunicationEventDecorator" + location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <container style="lefthalf"> + <section> + <widgets> + <label style="h1" + text="Communication Event id: ${parameters.communicationEventId}"></label> + <include-screen name="commEvent" /> + </widgets> + </section> + </container> + <container style="righthalf"> + <label style="h1" text="${uiLabelMap.CommonRelatedInformation}" /> <section> <widgets> <screenlet title="${uiLabelMap.PartyCommEventRoles}"> @@ -219,91 +219,91 @@ <include-screen name="commEvent" /> </widgets> </section> - <section> - <actions> - <entity-and list-name="commEvents" entity-name="CommunicationEvent"> - <field-map field-name="parentCommEventId" - env-name="parameters.communicationEventId" /> - </entity-and> - </actions> - <widgets> - <screenlet title="${uiLabelMap.PartyChildCommunicationEvents}"> - <include-form name="ListCommEvents" - location="component://party/webapp/partymgr/communication/CommForms.xml" /> - </screenlet> - </widgets> - </section> - <section> - <actions> - <set field="entityName" value="CustRequestAndCommEvent" /> - <set field="requestParameters.communicationEventId" - from-field="parameters.communicationEventId" /> - </actions> - <widgets> - <screenlet title="${uiLabelMap.OrderRequestList}"> + <section> + <actions> + <entity-and list-name="commEvents" entity-name="CommunicationEvent"> + <field-map field-name="parentCommEventId" + env-name="parameters.communicationEventId" /> + </entity-and> + </actions> + <widgets> + <screenlet title="${uiLabelMap.PartyChildCommunicationEvents}"> + <include-form name="ListCommEvents" + location="component://party/webapp/partymgr/communication/CommForms.xml" /> + </screenlet> + </widgets> + </section> + <section> + <actions> + <set field="entityName" value="CustRequestAndCommEvent" /> + <set field="requestParameters.communicationEventId" + from-field="parameters.communicationEventId" /> + </actions> + <widgets> + <screenlet title="${uiLabelMap.OrderRequestList}"> <include-form name="ListRequests" location="component://party/webapp/partymgr/communication/CommForms.xml"/> - </screenlet> - </widgets> - </section> - </container> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="commEvent"> - <section> - <widgets> - <screenlet title="${parent} ${uiLabelMap.PartyCommunicationEvent}"> - <section> - <condition> - <or><!-- have for e-mails a special form --> - <if-compare field-name="communicationEvent.communicationEventTypeId" - operator="equals" value="EMAIL_COMMUNICATION" /> - <if-compare field-name="communicationEvent.communicationEventTypeId" - operator="equals" value="AUTO_EMAIL_COMM" /> - </or> - </condition> - <widgets> - <section> - <condition> - <and> - <if-compare field-name="communicationEvent.statusId" - operator="equals" value="COM_UNKNOWN_PARTY" /> - <if-empty field-name="communicationEvent.partyIdFrom" /> - </and> - </condition> - <widgets> - <screenlet> - <container> - <label style="h1" text="Origin Email address not known!" /> - </container> - <container> - <label style="h2" - text="Allocate this message to a existing or new party and add an email address" /> - </container> + </screenlet> + </widgets> + </section> + </container> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="commEvent"> + <section> + <widgets> + <screenlet title="${parent} ${uiLabelMap.PartyCommunicationEvent}"> + <section> + <condition> + <or><!-- have for e-mails a special form --> + <if-compare field-name="communicationEvent.communicationEventTypeId" + operator="equals" value="EMAIL_COMMUNICATION" /> + <if-compare field-name="communicationEvent.communicationEventTypeId" + operator="equals" value="AUTO_EMAIL_COMM" /> + </or> + </condition> + <widgets> + <section> + <condition> + <and> + <if-compare field-name="communicationEvent.statusId" + operator="equals" value="COM_UNKNOWN_PARTY" /> + <if-empty field-name="communicationEvent.partyIdFrom" /> + </and> + </condition> + <widgets> + <screenlet> + <container> + <label style="h1" text="Origin Email address not known!" /> + </container> + <container> + <label style="h2" + text="Allocate this message to a existing or new party and add an email address" /> + </container> <include-form name="allocateMsgToPartyForm" location="component://party/webapp/partymgr/communication/CommForms.xml" /> <include-form name="deleteEmail" location="component://party/webapp/partymgr/communication/CommForms.xml" /> - </screenlet> - </widgets> - </section> - <include-form - location="component://party/webapp/partymgr/communication/CommForms.xml" - name="ViewEmail" /> - </widgets> - <fail-widgets> - <include-form - location="component://party/webapp/partymgr/communication/CommForms.xml" - name="ViewCommEvent" /> - </fail-widgets> - </section> - </screenlet> - </widgets> - </section> - </screen> + </screenlet> + </widgets> + </section> + <include-form + location="component://party/webapp/partymgr/communication/CommForms.xml" + name="ViewEmail" /> + </widgets> + <fail-widgets> + <include-form + location="component://party/webapp/partymgr/communication/CommForms.xml" + name="ViewCommEvent" /> + </fail-widgets> + </section> + </screenlet> + </widgets> + </section> + </screen> <screen name="EditCommunicationEvent"> <section> <actions> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml Fri Jan 23 03:08:47 2009 @@ -479,7 +479,7 @@ <set from-field="toCancelQuantity" field="createDetailMap.quantityOnHandDiff"/> <call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/> - <!-- reassign inventory reservations --> + <!-- reassign inventory reservations --> <set field="reassignInventoryReservationsCtx.productId" from-field="inventoryItem.productId"/> <set field="reassignInventoryReservationsCtx.facilityId" from-field="inventoryItem.facilityId"/> <call-service service-name="reassignInventoryReservations" in-map-name="reassignInventoryReservationsCtx"/> @@ -490,13 +490,13 @@ </entity-one> <if-compare value="Y" operator="equals" field="productStore.isImmediatelyFulfilled"> <log level="verbose" message="ProductStore with id ${productStore.productStoreId}, is immediatly fulfilled. Not reserving inventory"/> - <else> - <set field="reserveStoreInventoryMap.productId" from-field="inventoryItem.productId"/> - <set field="reserveStoreInventoryMap.orderId" from-field="itemIssuance.orderId"/> - <set field="reserveStoreInventoryMap.orderItemSeqId" from-field="itemIssuance.orderItemSeqId"/> - <set field="reserveStoreInventoryMap.shipGroupSeqId" from-field="itemIssuance.shipGroupSeqId"/> - <set field="reserveStoreInventoryMap.quantity" from-field="toCancelQuantity"/> - <set field="reserveStoreInventoryMap.productStoreId" from-field="orderHeader.productStoreId"/> + <else> + <set field="reserveStoreInventoryMap.productId" from-field="inventoryItem.productId"/> + <set field="reserveStoreInventoryMap.orderId" from-field="itemIssuance.orderId"/> + <set field="reserveStoreInventoryMap.orderItemSeqId" from-field="itemIssuance.orderItemSeqId"/> + <set field="reserveStoreInventoryMap.shipGroupSeqId" from-field="itemIssuance.shipGroupSeqId"/> + <set field="reserveStoreInventoryMap.quantity" from-field="toCancelQuantity"/> + <set field="reserveStoreInventoryMap.productStoreId" from-field="orderHeader.productStoreId"/> <call-service service-name="reserveStoreInventory" in-map-name="reserveStoreInventoryMap"/> </else> </if-compare> Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java Fri Jan 23 03:08:47 2009 @@ -309,7 +309,7 @@ } public BigDecimal getTotalPrice() { - BigDecimal totalPrice = basePrice; + BigDecimal totalPrice = basePrice; List<ConfigOption> options = getSelectedOptions(); for (ConfigOption oneOption: options) { totalPrice = totalPrice.add(oneOption.getPrice()); @@ -318,7 +318,7 @@ } private void setDefaultPrice() { - BigDecimal totalPrice = basePrice; + BigDecimal totalPrice = basePrice; List<ConfigOption> options = getDefaultOptions(); for (ConfigOption oneOption: options) { totalPrice = totalPrice.add(oneOption.getPrice()); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java Fri Jan 23 03:08:47 2009 @@ -81,8 +81,8 @@ String inventoryType = inventoryItem.getString("inventoryItemTypeId"); if (inventoryType.equals("NON_SERIAL_INV_ITEM")) { - BigDecimal atp = inventoryItem.getBigDecimal("availableToPromiseTotal"); - BigDecimal qoh = inventoryItem.getBigDecimal("quantityOnHandTotal"); + BigDecimal atp = inventoryItem.getBigDecimal("availableToPromiseTotal"); + BigDecimal qoh = inventoryItem.getBigDecimal("quantityOnHandTotal"); if (atp == null) { return ServiceUtil.returnError("The request transfer amount is not available, there is no available to promise on the Inventory Item with ID " + inventoryItem.getString("inventoryItemId")); @@ -106,7 +106,7 @@ // NOTE: atp should always be <= qoh, so if xfer < atp, then xfer < qoh, so no need to check/handle that // however, if atp < qoh && atp == xferQty, then we still need to split; oh, but no need to check atp == xferQty in the second part because if it isn't greater and isn't less, then it is equal if (xferQty.compareTo(atp) < 0 || atp.compareTo(qoh) < 0) { - BigDecimal negXferQty = xferQty.negate(); + BigDecimal negXferQty = xferQty.negate(); // NOTE: new inventory items should always be created calling the // createInventoryItem service because in this way we are sure // that all the relevant fields are filled with default values. @@ -218,8 +218,8 @@ if (inventoryType.equals("NON_SERIAL_INV_ITEM")) { // add an adjusting InventoryItemDetail so set ATP back to QOH: ATP = ATP + (QOH - ATP), diff = QOH - ATP - BigDecimal atp = inventoryItem.get("availableToPromiseTotal") == null ? BigDecimal.ZERO : inventoryItem.getBigDecimal("availableToPromiseTotal"); - BigDecimal qoh = inventoryItem.get("quantityOnHandTotal") == null ? BigDecimal.ZERO : inventoryItem.getBigDecimal("quantityOnHandTotal"); + BigDecimal atp = inventoryItem.get("availableToPromiseTotal") == null ? BigDecimal.ZERO : inventoryItem.getBigDecimal("availableToPromiseTotal"); + BigDecimal qoh = inventoryItem.get("quantityOnHandTotal") == null ? BigDecimal.ZERO : inventoryItem.getBigDecimal("quantityOnHandTotal"); Map<String, Object> createDetailMap = UtilMisc.toMap("availableToPromiseDiff", qoh.subtract(atp), "inventoryItemId", inventoryItem.get("inventoryItemId"), "userLogin", userLogin); try { @@ -308,8 +308,8 @@ // re-set the fields on the item if (inventoryType.equals("NON_SERIAL_INV_ITEM")) { // add an adjusting InventoryItemDetail so set ATP back to QOH: ATP = ATP + (QOH - ATP), diff = QOH - ATP - BigDecimal atp = inventoryItem.get("availableToPromiseTotal") == null ? BigDecimal.ZERO : inventoryItem.getBigDecimal("availableToPromiseTotal"); - BigDecimal qoh = inventoryItem.get("quantityOnHandTotal") == null ? BigDecimal.ZERO : inventoryItem.getBigDecimal("quantityOnHandTotal"); + BigDecimal atp = inventoryItem.get("availableToPromiseTotal") == null ? BigDecimal.ZERO : inventoryItem.getBigDecimal("availableToPromiseTotal"); + BigDecimal qoh = inventoryItem.get("quantityOnHandTotal") == null ? BigDecimal.ZERO : inventoryItem.getBigDecimal("quantityOnHandTotal"); Map<String, Object> createDetailMap = UtilMisc.toMap("availableToPromiseDiff", qoh.subtract(atp), "inventoryItemId", inventoryItem.get("inventoryItemId"), "userLogin", userLogin); @@ -640,8 +640,8 @@ if (UtilValidate.isNotEmpty(productAssocList)) { // minimum QOH and ATP encountered - BigDecimal minQuantityOnHandTotal = null; - BigDecimal minAvailableToPromiseTotal = null; + BigDecimal minQuantityOnHandTotal = null; + BigDecimal minAvailableToPromiseTotal = null; // loop through each associated product. for (GenericValue productAssoc: productAssocList) { @@ -762,14 +762,14 @@ // add the results for this facility to the ATP/QOH counter for all facilities if (!ServiceUtil.isError(invResult)) { - BigDecimal fatp = (BigDecimal) invResult.get("availableToPromiseTotal"); - BigDecimal fqoh = (BigDecimal) invResult.get("quantityOnHandTotal"); + BigDecimal fatp = (BigDecimal) invResult.get("availableToPromiseTotal"); + BigDecimal fqoh = (BigDecimal) invResult.get("quantityOnHandTotal"); if (fatp != null) atp = atp.add(fatp); if (fqoh != null) qoh = qoh.add(fqoh); } if (("MARKETING_PKG_AUTO".equals(product.getString("productTypeId")) || "MARKETING_PKG_PICK".equals(product.getString("productTypeId"))) && (!ServiceUtil.isError(mktgPkgInvResult))) { - BigDecimal fatp = (BigDecimal) mktgPkgInvResult.get("availableToPromiseTotal"); - BigDecimal fqoh = (BigDecimal) mktgPkgInvResult.get("quantityOnHandTotal"); + BigDecimal fatp = (BigDecimal) mktgPkgInvResult.get("availableToPromiseTotal"); + BigDecimal fqoh = (BigDecimal) mktgPkgInvResult.get("quantityOnHandTotal"); if (fatp != null) mktgPkgAtp = mktgPkgAtp.add(fatp); if (fqoh != null) mktgPkgQoh = mktgPkgQoh.add(fqoh); } Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryWorker.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryWorker.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryWorker.java Fri Jan 23 03:08:47 2009 @@ -73,15 +73,15 @@ * @return */ public static BigDecimal getOutstandingPurchasedQuantity(String productId, GenericDelegator delegator) { - BigDecimal qty = BigDecimal.ZERO; + BigDecimal qty = BigDecimal.ZERO; List<GenericValue> purchaseOrders = getOutstandingPurchaseOrders(productId, delegator); if (UtilValidate.isEmpty(purchaseOrders)) { return qty; } else { for (GenericValue nextOrder: purchaseOrders) { if (nextOrder.get("quantity") != null) { - BigDecimal itemQuantity = nextOrder.getBigDecimal("quantity"); - BigDecimal cancelQuantity = BigDecimal.ZERO; + BigDecimal itemQuantity = nextOrder.getBigDecimal("quantity"); + BigDecimal cancelQuantity = BigDecimal.ZERO; if (nextOrder.get("cancelQuantity") != null) { cancelQuantity = nextOrder.getBigDecimal("cancelQuantity"); } Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java Fri Jan 23 03:08:47 2009 @@ -374,7 +374,7 @@ List<GenericValue> tempDefaultPriceList = EntityUtil.filterByAnd(curVariantPriceList, UtilMisc.toMap("productPriceTypeId", "DEFAULT_PRICE")); GenericValue curDefaultPriceValue = EntityUtil.getFirst(tempDefaultPriceList); if (curDefaultPriceValue != null) { - BigDecimal curDefaultPrice = curDefaultPriceValue.getBigDecimal("price"); + BigDecimal curDefaultPrice = curDefaultPriceValue.getBigDecimal("price"); if (minDefaultPrice == null || curDefaultPrice.compareTo(minDefaultPrice) < 0) { // check to see if the product is discontinued for sale before considering it the lowest price GenericValue curVariantProduct = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", curVariantProductId)); @@ -504,7 +504,7 @@ try { Map<String, Object> outMap = dispatcher.runSync(customMethod.getString("customMethodName"), inMap); if (!ServiceUtil.isError(outMap)) { - BigDecimal calculatedDefaultPrice = (BigDecimal)outMap.get("price"); + BigDecimal calculatedDefaultPrice = (BigDecimal)outMap.get("price"); orderItemPriceInfos = UtilGenerics.checkList(outMap.get("orderItemPriceInfos")); if (UtilValidate.isNotEmpty(calculatedDefaultPrice)) { defaultPrice = calculatedDefaultPrice; @@ -528,7 +528,7 @@ // no list price, use defaultPrice for the final price // ========= ensure calculated price is not below minSalePrice or above maxSalePrice ========= - BigDecimal maxSellPrice = maximumPriceValue != null ? maximumPriceValue.getBigDecimal("price") : null; + BigDecimal maxSellPrice = maximumPriceValue != null ? maximumPriceValue.getBigDecimal("price") : null; if (maxSellPrice != null && defaultPrice.compareTo(maxSellPrice) > 0) { defaultPrice = maxSellPrice; } Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java Fri Jan 23 03:08:47 2009 @@ -1059,7 +1059,7 @@ } } } - return ServiceUtil.returnSuccess(); + return ServiceUtil.returnSuccess(); } /** Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java Fri Jan 23 03:08:47 2009 @@ -470,20 +470,20 @@ } public static String getProductvirtualVariantMethod(GenericDelegator delegator, String productId) { - GenericValue product = null; + GenericValue product = null; try { - product = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", productId)); + product = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", productId)); } catch (GenericEntityException e) { Debug.logError(e, module); } if (product != null) { - return product.getString("virtualVariantMethodEnum"); + return product.getString("virtualVariantMethodEnum"); } else { - return null; + return null; } } - + /** * * @param product @@ -505,13 +505,13 @@ List<Map<String,String>> featureList = FastList.newInstance(); for (GenericValue productFeatureAppl: featuresSorted) { if (oldType == null || !oldType.equals(productFeatureAppl.getString("productFeatureTypeId"))) { - // use first entry for type and description + // use first entry for type and description if (oldType != null) { featureTypeFeatures.add(featureList); featureList = FastList.newInstance(); } GenericValue productFeatureType = delegator.findByPrimaryKey("ProductFeatureType", UtilMisc.toMap("productFeatureTypeId", - productFeatureAppl.getString("productFeatureTypeId"))); + productFeatureAppl.getString("productFeatureTypeId"))); featureList.add(UtilMisc.<String, String>toMap("productFeatureTypeId", productFeatureAppl.getString("productFeatureTypeId"), "description", productFeatureType.getString("description"))); oldType = productFeatureAppl.getString("productFeatureTypeId"); @@ -519,17 +519,17 @@ // fill other entries with featureId, description and default price and currency Map<String,String> featureData = UtilMisc.toMap("productFeatureId", productFeatureAppl.getString("productFeatureId")); if (UtilValidate.isNotEmpty(productFeatureAppl.get("description"))) { - featureData.put("description", productFeatureAppl.getString("description")); + featureData.put("description", productFeatureAppl.getString("description")); } else { - featureData.put("description", productFeatureAppl.getString("productFeatureId")); + featureData.put("description", productFeatureAppl.getString("productFeatureId")); } List<GenericValue> productFeaturePrices = EntityUtil.filterByDate(delegator.findByAnd("ProductFeaturePrice", - UtilMisc.toMap("productFeatureId", productFeatureAppl.getString("productFeatureId"), "productPriceTypeId", "DEFAULT_PRICE"))); + UtilMisc.toMap("productFeatureId", productFeatureAppl.getString("productFeatureId"), "productPriceTypeId", "DEFAULT_PRICE"))); if (UtilValidate.isNotEmpty(productFeaturePrices)) { - GenericValue productFeaturePrice = productFeaturePrices.get(0); + GenericValue productFeaturePrice = productFeaturePrices.get(0); if (UtilValidate.isNotEmpty(productFeaturePrice.get("price"))) { - featureData.put("price", productFeaturePrice.getBigDecimal("price").toString()); - featureData.put("currencyUomId", productFeaturePrice.getString("currencyUomId")); + featureData.put("price", productFeaturePrice.getBigDecimal("price").toString()); + featureData.put("currencyUomId", productFeaturePrice.getString("currencyUomId")); } } featureList.add(featureData); @@ -573,7 +573,7 @@ // product calc methods public static BigDecimal calcOrderAdjustments(List<GenericValue> orderHeaderAdjustments, BigDecimal subTotal, boolean includeOther, boolean includeTax, boolean includeShipping) { - BigDecimal adjTotal = BigDecimal.ZERO; + BigDecimal adjTotal = BigDecimal.ZERO; if (UtilValidate.isNotEmpty(orderHeaderAdjustments)) { List<GenericValue> filteredAdjs = filterOrderAdjustments(orderHeaderAdjustments, includeOther, includeTax, includeShipping, false, false); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java Fri Jan 23 03:08:47 2009 @@ -245,7 +245,7 @@ subContext.put("orderCreatedDate", orderCreatedDate); List<GenericValue> orderItemList = orderHeader.getRelated("OrderItem"); for (GenericValue orderItem: orderItemList) { - BigDecimal qty = orderItem.getBigDecimal("quantity"); + BigDecimal qty = orderItem.getBigDecimal("quantity"); String productId = orderItem.getString("productId"); if (UtilValidate.isEmpty(productId)) { continue; Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java Fri Jan 23 03:08:47 2009 @@ -730,7 +730,7 @@ } protected void updateShipmentRouteSegments() throws GeneralException { - BigDecimal shipmentWeight = getTotalWeight(); + BigDecimal shipmentWeight = getTotalWeight(); if (shipmentWeight.compareTo(BigDecimal.ZERO) <= 0) return; List<GenericValue> shipmentRouteSegments = getDelegator().findByAnd("ShipmentRouteSegment", UtilMisc.toMap("shipmentId", this.getShipmentId())); if (! UtilValidate.isEmpty(shipmentRouteSegments)) { @@ -787,7 +787,7 @@ public BigDecimal getTotalWeight() { BigDecimal total = BigDecimal.ZERO; for (int i = 0; i < packageSeq; i++) { - BigDecimal packageWeight = getPackageWeight(i); + BigDecimal packageWeight = getPackageWeight(i); if (! UtilValidate.isEmpty(packageWeight)) { total = total.add(packageWeight); } Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java Fri Jan 23 03:08:47 2009 @@ -1631,7 +1631,7 @@ BigDecimal weight = totalWeight.divide(BigDecimal.valueOf(pieces), generalRounding); for (int z = 1; z <= totalQuantity.intValue(); z++) { - BigDecimal partialQty = pieces > 1 ? BigDecimal.ONE.divide(BigDecimal.valueOf(pieces), generalRounding) : BigDecimal.ONE; + BigDecimal partialQty = pieces > 1 ? BigDecimal.ONE.divide(BigDecimal.valueOf(pieces), generalRounding) : BigDecimal.ONE; for (long x = 0; x < pieces; x++) { if(itemInfo.get("inShippingBox") != null && ((String) itemInfo.get("inShippingBox")).equalsIgnoreCase("Y")) { Map<String, BigDecimal> newPackage = FastMap.newInstance(); @@ -1654,7 +1654,7 @@ if (!addedToPackage) { BigDecimal packageWeight = calcPackageWeight(packageMap, shippableItemInfo, weight); if (packageWeight.compareTo(maxWeight) <= 0) { - BigDecimal qty = packageMap.get(productId); + BigDecimal qty = packageMap.get(productId); qty = qty == null ? BigDecimal.ZERO : qty; packageMap.put(productId, qty.add(partialQty)); addedToPackage = true; Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java Fri Jan 23 03:08:47 2009 @@ -248,7 +248,7 @@ BigDecimal weight = totalWeight.divide(BigDecimal.valueOf(pieces), generalRounding); for (int z = 1; z <= totalQuantity.intValue(); z++) { - BigDecimal partialQty = pieces > 1 ? BigDecimal.ONE.divide(BigDecimal.valueOf(pieces), generalRounding) : BigDecimal.ONE; + BigDecimal partialQty = pieces > 1 ? BigDecimal.ONE.divide(BigDecimal.valueOf(pieces), generalRounding) : BigDecimal.ONE; for (long x = 0; x < pieces; x++) { if (weight.compareTo(maxWeight) >= 0) { Map<String, BigDecimal> newPackage = FastMap.newInstance(); @@ -266,7 +266,7 @@ if (!addedToPackage) { BigDecimal packageWeight = calcPackageWeight(dctx, packageMap, shippableItemInfo, weight); if (packageWeight.compareTo(maxWeight) <= 0) { - BigDecimal qty = (BigDecimal) packageMap.get(productId); + BigDecimal qty = (BigDecimal) packageMap.get(productId); qty = qty == null ? BigDecimal.ZERO : qty; packageMap.put(productId, qty.add(partialQty)); addedToPackage = true; Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContentContent.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContentContent.groovy?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContentContent.groovy (original) +++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContentContent.groovy Fri Jan 23 03:08:47 2009 @@ -120,7 +120,7 @@ } else if ("FULFILLMENT_EXTERNAL".equals(productContentTypeId)) { context.contentFormName = "EditProductContentExternal"; } else if (productContentTypeId.indexOf("ADDITIONAL_IMAGE") > -1) { - context.contentFormName = "EditProductAdditionalImageContent"; + context.contentFormName = "EditProductAdditionalImageContent"; } else { //Assume it is a generic simple text content textData = [:]; Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/FindFacility.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/FindFacility.groovy?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/FindFacility.groovy (original) +++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/FindFacility.groovy Fri Jan 23 03:08:47 2009 @@ -21,13 +21,13 @@ findResult = delegator.findAll("Facility"); findResultSize = findResult.size(); if(findResultSize == 1) { - context.showScreen = "one"; - context.facility = findResult.get(0); - context.parameters.facilityId = context.facility.facilityId; + context.showScreen = "one"; + context.facility = findResult.get(0); + context.parameters.facilityId = context.facility.facilityId; } if((findResultSize > 1 ) && (findResultSize <= 10)) { - context.showScreen = "ten"; + context.showScreen = "ten"; } else if((findResultSize > 10 ) || (findResultSize <= 0)) { - context.showScreen = "more"; + context.showScreen = "more"; } \ No newline at end of file Modified: ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml Fri Jan 23 03:08:47 2009 @@ -30,8 +30,8 @@ <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="TemporalExpressionUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="TemporalExpressionUiLabels" map-name="uiLabelMap" global="true"/> <set field="layoutSettings.companyName" from-field="uiLabelMap.WorkEffortCompanyName" global="true"/> <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.WorkEffortCompanySubtitle" global="true"/> Modified: ofbiz/trunk/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/build.xml (original) +++ ofbiz/trunk/build.xml Fri Jan 23 03:08:47 2009 @@ -23,8 +23,8 @@ <property name="memory.initial.param" value="-Xms128M"/> <property name="memory.max.param" value="-Xmx512M"/> - <available file="applications/build.xml" property="applications.present"/> - <available file="specialpurpose/build.xml" property="specialpurpose.present"/> + <available file="applications/build.xml" property="applications.present"/> + <available file="specialpurpose/build.xml" property="specialpurpose.present"/> <!-- ================================================================== --> <!-- Initialization of all property settings --> @@ -102,7 +102,7 @@ <include name="**/build.xml"/> </fileset> </subant> - + <subant target="clean" failonerror="${specialpurpose.present}" description="Use failonerror=false in case the specialpurpose directory is not there"> <filelist dir="." files="specialpurpose/build.xml"/> </subant> @@ -177,7 +177,7 @@ destdir="${site.dir}/javadocs" maxmemory="256M" windowtitle="Open for Business - API" - useexternalfile="yes"> + useexternalfile="yes"> <fileset dir="${basedir}" defaultexcludes="yes"> <include name="**/*.java"/> <exclude name="**/ControlApplet.java"/> Modified: ofbiz/trunk/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java (original) +++ ofbiz/trunk/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java Fri Jan 23 03:08:47 2009 @@ -412,10 +412,10 @@ for (File f: elements) { if (f.exists()) { if (f.isDirectory()) { - String path = f.getAbsolutePath(); + String path = f.getAbsolutePath(); dir.add(path.replace('\\','/')); } else { - String path = f.getAbsolutePath(); + String path = f.getAbsolutePath(); jar.add(path.replace('\\','/')); } } Modified: ofbiz/trunk/framework/appserver/templates/orion202/ofbiz-application.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/appserver/templates/orion202/ofbiz-application.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/appserver/templates/orion202/ofbiz-application.xml (original) +++ ofbiz/trunk/framework/appserver/templates/orion202/ofbiz-application.xml Fri Jan 23 03:08:47 2009 @@ -20,7 +20,7 @@ --> <!-- The global application config that is the parent of all the other - applications in this server. --> + applications in this server. --> <orion-application> <web-module id="ofbizDefault" path="${env.get("ofbiz.home")}/website"/> @@ -30,7 +30,7 @@ <persistence path="../persistence"/> <!-- Path to the libraries that are installed on this server. - These will accesible for the servlets, EJBs etc --> + These will accesible for the servlets, EJBs etc --> <library path="../lib"/> <#list classpathJars as jar> <library path="${jar}"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |