svn commit: r984399 [3/16] - in /ofbiz/branches/jquery: ./ applications/accounting/config
Locked
svn commit: r984399 [3/16] - in /ofbiz/branches/jquery: ./ applications/accounting/config
 
|
Modified: ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/order/BillingAccountOrders.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/order/BillingAccountOrders.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/order/BillingAccountOrders.groovy (original) +++ ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/order/BillingAccountOrders.groovy Wed Aug 11 13:22:40 2010 @@ -38,4 +38,4 @@ if (billingAccountId) { } context.orderPaymentPreferencesList = orderPaymentPreferencesList; } -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/payment/BillingAccounts.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/payment/BillingAccounts.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/payment/BillingAccounts.groovy (original) +++ ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/payment/BillingAccounts.groovy Wed Aug 11 13:22:40 2010 @@ -28,4 +28,4 @@ if (partyId) { if (billingAccountAndRoles) currencyUomId = billingAccountAndRoles.first().accountCurrencyUomId; if (currencyUomId) billingAccounts = BillingAccountWorker.makePartyBillingAccountList(userLogin, currencyUomId, partyId, delegator, dispatcher); } -context.billingAccounts = billingAccounts; \ No newline at end of file +context.billingAccounts = billingAccounts; Modified: ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/payment/PaymentReport.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/payment/PaymentReport.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/payment/PaymentReport.groovy (original) +++ ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/payment/PaymentReport.groovy Wed Aug 11 13:22:40 2010 @@ -41,4 +41,4 @@ birtParameters.comments_ic = request.get birtParameters.comments_op = request.getParameter("comments_op"); birtParameters.comments = request.getParameter("comments"); request.setAttribute("birtParameters", birtParameters); -return "success"; \ No newline at end of file +return "success"; Modified: ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/payment/PrintChecks.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/payment/PrintChecks.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/payment/PrintChecks.groovy (original) +++ ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/payment/PrintChecks.groovy Wed Aug 11 13:22:40 2010 @@ -64,4 +64,4 @@ paymentGroupMembers = EntityUtil.filterB paymentGroupMembers.each { paymentGropupMember-> payments.add(paymentGropupMember.getRelatedOne("Payment")); } -context.payments = payments; \ No newline at end of file +context.payments = payments; Modified: ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy (original) +++ ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy Wed Aug 11 13:22:40 2010 @@ -423,4 +423,4 @@ context.equityBalanceTotal = balanceTota context.liabilityEquityBalanceTotal = context.liabilityBalanceTotal + context.equityBalanceTotal balanceTotalList.add(UtilMisc.toMap("totalName", "AccountingTotalLiabilitiesAndEquities", "balance", context.liabilityEquityBalanceTotal)); -context.balanceTotalList = balanceTotalList; \ No newline at end of file +context.balanceTotalList = balanceTotalList; Modified: ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/reports/CashFlowStatement.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/reports/CashFlowStatement.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/reports/CashFlowStatement.groovy (original) +++ ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/reports/CashFlowStatement.groovy Wed Aug 11 13:22:40 2010 @@ -224,4 +224,4 @@ context.openingCashBalanceList.add(["acc // ENDING BALANCE = OPENING CASH BALANCE + PERIOD CASH BALANCE endingCashBalanceTotal = openingCashBalanceTotal.add(periodCashBalanceTotal); cashFlowBalanceTotalList.add("totalName":"AccountingEndingCashBalance", "balance":endingCashBalanceTotal); -context.cashFlowBalanceTotalList = cashFlowBalanceTotalList; \ No newline at end of file +context.cashFlowBalanceTotalList = cashFlowBalanceTotalList; Modified: ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/CaptureTransaction.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/CaptureTransaction.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/CaptureTransaction.groovy (original) +++ ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/CaptureTransaction.groovy Wed Aug 11 13:22:40 2010 @@ -58,4 +58,4 @@ if (orderPaymentPreference) { } else { // todo: some kind of error telling user to re-authorize } -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl (original) +++ ofbiz/branches/jquery/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl Wed Aug 11 13:22:40 2010 @@ -96,7 +96,7 @@ under the License. <#-- if the item has a description, then use its description. Otherwise, use the description of the invoiceItemType --> <#list invoiceItems as invoiceItem> <#assign itemType = invoiceItem.getRelatedOne("InvoiceItemType")> - <#assign isItemAdjustment = Static["org.ofbiz.common.CommonWorkers"].hasParentType(delegator, "InvoiceItemType", "invoiceItemTypeId", itemType.getString("invoiceItemTypeId"), "parentTypeId", "INVOICE_ADJ")/> + <#assign isItemAdjustment = Static["org.ofbiz.entity.util.EntityTypeUtil"].hasParentType(delegator, "InvoiceItemType", "invoiceItemTypeId", itemType.getString("invoiceItemTypeId"), "parentTypeId", "INVOICE_ADJ")/> <#assign taxRate = invoiceItem.getRelatedOne("TaxAuthorityRateProduct")?if_exists> <#assign itemBillings = invoiceItem.getRelated("OrderItemBilling")?if_exists> Modified: ofbiz/branches/jquery/applications/accounting/webapp/ap/WEB-INF/actions/invoices/CommissionRun.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/ap/WEB-INF/actions/invoices/CommissionRun.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/webapp/ap/WEB-INF/actions/invoices/CommissionRun.groovy (original) +++ ofbiz/branches/jquery/applications/accounting/webapp/ap/WEB-INF/actions/invoices/CommissionRun.groovy Wed Aug 11 13:22:40 2010 @@ -22,7 +22,6 @@ import org.ofbiz.entity.condition.Entity fromDate = parameters.fromDate; thruDate = parameters.thruDate; -partyIds = parameters.partyIds; if (fromDate) { List invoiceCond = []; @@ -33,8 +32,8 @@ if (fromDate) { if (thruDate) { invoiceCond.add(EntityCondition.makeCondition("invoiceDate", EntityOperator.LESS_THAN_EQUAL_TO, Timestamp.valueOf(thruDate))); } - if (partyIds) { - invoiceCond.add(EntityCondition.makeCondition("invoiceRolePartyId", EntityOperator.IN, partyIds)); + if (context.salesRepPartyList) { + invoiceCond.add(EntityCondition.makeCondition("invoiceRolePartyId", EntityOperator.IN, context.salesRepPartyList)); } invoiceList = delegator.findList("InvoiceAndRole", EntityCondition.makeCondition(invoiceCond, EntityOperator.AND), null, null, null, false); Modified: ofbiz/branches/jquery/applications/accounting/webapp/ap/invoices/CommissionRun.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/ap/invoices/CommissionRun.ftl?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/webapp/ap/invoices/CommissionRun.ftl (original) +++ ofbiz/branches/jquery/applications/accounting/webapp/ap/invoices/CommissionRun.ftl Wed Aug 11 13:22:40 2010 @@ -76,8 +76,8 @@ function enableSubmitButton() { <#if invoices?has_content > <form name="listSalesInvoices" id="listSalesInvoices" method="post"> - <#if parties?has_content> - <input type="hidden" name="partyIds" value="${parties?if_exists}"/> + <#if salesRepPartyList?has_content> + ${setRequestAttribute("partyIds", salesRepPartyList)} </#if> <div align="right"> <select name="serviceName" id="serviceName" onchange="javascript:setServiceName(this);"> Modified: ofbiz/branches/jquery/applications/accounting/widget/AgreementScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/AgreementScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/AgreementScreens.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/AgreementScreens.xml Wed Aug 11 13:22:40 2010 @@ -739,4 +739,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/accounting/widget/BillingAccountScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/BillingAccountScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/BillingAccountScreens.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/BillingAccountScreens.xml Wed Aug 11 13:22:40 2010 @@ -276,4 +276,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/accounting/widget/CostForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/CostForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/CostForms.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/CostForms.xml Wed Aug 11 13:22:40 2010 @@ -74,4 +74,4 @@ under the License. <submit button-type="button"/> </field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/accounting/widget/CostScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/CostScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/CostScreens.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/CostScreens.xml Wed Aug 11 13:22:40 2010 @@ -45,4 +45,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/accounting/widget/GlScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/GlScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/GlScreens.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/GlScreens.xml Wed Aug 11 13:22:40 2010 @@ -679,4 +679,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/accounting/widget/InvoiceItemTypeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/InvoiceItemTypeForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/InvoiceItemTypeForms.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/InvoiceItemTypeForms.xml Wed Aug 11 13:22:40 2010 @@ -34,4 +34,4 @@ under the License. </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/accounting/widget/InvoiceItemTypeScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/InvoiceItemTypeScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/InvoiceItemTypeScreens.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/InvoiceItemTypeScreens.xml Wed Aug 11 13:22:40 2010 @@ -43,4 +43,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/accounting/widget/InvoiceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/InvoiceScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/InvoiceScreens.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/InvoiceScreens.xml Wed Aug 11 13:22:40 2010 @@ -587,4 +587,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/accounting/widget/PaymentGatewayConfigForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/PaymentGatewayConfigForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/PaymentGatewayConfigForms.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/PaymentGatewayConfigForms.xml Wed Aug 11 13:22:40 2010 @@ -418,4 +418,4 @@ under the License. <submit button-type="button"/> </field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/accounting/widget/PaymentGatewayConfigScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/PaymentGatewayConfigScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/PaymentGatewayConfigScreens.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/PaymentGatewayConfigScreens.xml Wed Aug 11 13:22:40 2010 @@ -250,4 +250,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/accounting/widget/PaymentMethodTypeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/PaymentMethodTypeForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/PaymentMethodTypeForms.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/PaymentMethodTypeForms.xml Wed Aug 11 13:22:40 2010 @@ -34,4 +34,4 @@ under the License. </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/accounting/widget/PaymentMethodTypeScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/PaymentMethodTypeScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/PaymentMethodTypeScreens.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/PaymentMethodTypeScreens.xml Wed Aug 11 13:22:40 2010 @@ -43,4 +43,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/accounting/widget/TransactionForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/TransactionForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/TransactionForms.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/TransactionForms.xml Wed Aug 11 13:22:40 2010 @@ -184,4 +184,4 @@ under the License. <field name="captureAmount" title="${uiLabelMap.AccountingAmount}"><text/></field> <field name="submitButton" title="${uiLabelMap.AccountingCapture}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/accounting/widget/TransactionScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/TransactionScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/TransactionScreens.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/TransactionScreens.xml Wed Aug 11 13:22:40 2010 @@ -169,4 +169,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/accounting/widget/ap/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/ap/CommonScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/ap/CommonScreens.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/ap/CommonScreens.xml Wed Aug 11 13:22:40 2010 @@ -263,4 +263,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/accounting/widget/ap/InvoiceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/ap/InvoiceScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/ap/InvoiceScreens.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/ap/InvoiceScreens.xml Wed Aug 11 13:22:40 2010 @@ -165,7 +165,7 @@ under the License. <actions> <set field="titleProperty" value="AccountingFindSalesInvoicesForCommissionRun"/> <set field="tabButtonItem" value="commissionRun"/> - <set field="parties" type="List" from-field="parameters.partyIds"/> + <set field="salesRepPartyList" type="List" from-field="parameters.partyIds"/> <script location="component://accounting/webapp/ap/WEB-INF/actions/invoices/CommissionRun.groovy"/> </actions> <widgets> Modified: ofbiz/branches/jquery/applications/accounting/widget/ap/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/ap/LookupScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/ap/LookupScreens.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/ap/LookupScreens.xml Wed Aug 11 13:22:40 2010 @@ -72,4 +72,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/accounting/widget/ap/forms/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/ap/forms/LookupForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/ap/forms/LookupForms.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/ap/forms/LookupForms.xml Wed Aug 11 13:22:40 2010 @@ -65,4 +65,4 @@ under the License. <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/accounting/widget/ap/forms/VendorForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/ap/forms/VendorForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/ap/forms/VendorForms.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/ap/forms/VendorForms.xml Wed Aug 11 13:22:40 2010 @@ -82,4 +82,4 @@ under the License. <form name="FindApPaymentGroups" target="FindApPaymentGroups" extends="FindPaymentGroup" extends-resource="component://accounting/widget/PaymentGroupForms.xml"> <field name="paymentGroupTypeId"><hidden value="CHECK_RUN"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/accounting/widget/ar/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/ar/LookupScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/ar/LookupScreens.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/ar/LookupScreens.xml Wed Aug 11 13:22:40 2010 @@ -72,4 +72,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/accounting/widget/ar/forms/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/ar/forms/LookupForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/ar/forms/LookupForms.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/ar/forms/LookupForms.xml Wed Aug 11 13:22:40 2010 @@ -65,4 +65,4 @@ under the License. <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/commonext/config/SetupUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/commonext/config/SetupUiLabels.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/commonext/config/SetupUiLabels.xml (original) +++ ofbiz/branches/jquery/applications/commonext/config/SetupUiLabels.xml Wed Aug 11 13:22:40 2010 @@ -148,4 +148,4 @@ <value xml:lang="en">Setup only works if there are no organizations defined yet</value> <value xml:lang="it">Configura solo i lavori se non c'è ancora nessuna organizzazione definita</value> </property> -</resource> \ No newline at end of file +</resource> Modified: ofbiz/branches/jquery/applications/commonext/data/GlAccountData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/commonext/data/GlAccountData.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/commonext/data/GlAccountData.xml (original) +++ ofbiz/branches/jquery/applications/commonext/data/GlAccountData.xml Wed Aug 11 13:22:40 2010 @@ -161,4 +161,4 @@ <VarianceReasonGlAccount organizationPartyId="ORGPARTYID" varianceReasonId="VAR_INTEGR" glAccountId="514000"/> <VarianceReasonGlAccount organizationPartyId="ORGPARTYID" varianceReasonId="VAR_SAMPLE" glAccountId="625000"/> -</entity-engine-xml> \ No newline at end of file +</entity-engine-xml> Modified: ofbiz/branches/jquery/applications/commonext/data/ProductStoreData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/commonext/data/ProductStoreData.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/commonext/data/ProductStoreData.xml (original) +++ ofbiz/branches/jquery/applications/commonext/data/ProductStoreData.xml Wed Aug 11 13:22:40 2010 @@ -71,4 +71,4 @@ <ShipmentCostEstimate productStoreId="PRODUCTSTOREID" orderFlatPrice="0.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="EXPRESS" carrierPartyId="FEDEX" carrierRoleTypeId="CARRIER"/> <ShipmentCostEstimate productStoreId="PRODUCTSTOREID" orderFlatPrice="0.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="GROUND" carrierPartyId="FEDEX" carrierRoleTypeId="CARRIER"/> <ShipmentCostEstimate productStoreId="PRODUCTSTOREID" orderFlatPrice="0.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="GROUND_HOME" carrierPartyId="FEDEX" carrierRoleTypeId="CARRIER"/> -</entity-engine-xml> \ No newline at end of file +</entity-engine-xml> Modified: ofbiz/branches/jquery/applications/commonext/data/ShippingData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/commonext/data/ShippingData.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/commonext/data/ShippingData.xml (original) +++ ofbiz/branches/jquery/applications/commonext/data/ShippingData.xml Wed Aug 11 13:22:40 2010 @@ -109,4 +109,4 @@ <CarrierShipmentBoxType shipmentBoxTypeId="FX10KGBOX" partyId="FEDEX" packagingTypeCode="FEDEX10KGBOX"/> <CarrierShipmentBoxType shipmentBoxTypeId="FX25KGBOX" partyId="FEDEX" packagingTypeCode="FEDEX25KGBOX"/> <CarrierShipmentBoxType shipmentBoxTypeId="YOURPACKNG" partyId="FEDEX" packagingTypeCode="YOURPACKAGING"/> -</entity-engine-xml> \ No newline at end of file +</entity-engine-xml> Modified: ofbiz/branches/jquery/applications/commonext/data/SystemInfoPortletData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/commonext/data/SystemInfoPortletData.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/commonext/data/SystemInfoPortletData.xml (original) +++ ofbiz/branches/jquery/applications/commonext/data/SystemInfoPortletData.xml Wed Aug 11 13:22:40 2010 @@ -41,4 +41,4 @@ screenshot="/images/portlets/SystemInfoStatus.png"/> <PortletPortletCategory portalPortletId="SystemInfoStatus" portletCategoryId="SYSTEMINFO"/> -</entity-engine-xml> \ No newline at end of file +</entity-engine-xml> Modified: ofbiz/branches/jquery/applications/commonext/data/helpdata/HELP_SETUP_initialsetup.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/commonext/data/helpdata/HELP_SETUP_initialsetup.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/commonext/data/helpdata/HELP_SETUP_initialsetup.xml (original) +++ ofbiz/branches/jquery/applications/commonext/data/helpdata/HELP_SETUP_initialsetup.xml Wed Aug 11 13:22:40 2010 @@ -42,4 +42,4 @@ , "Payment (AR) Address", "General Correspondence Address", any telephone numbers, and email addresses you want for your Company. </para> </section> -</section> \ No newline at end of file +</section> Modified: ofbiz/branches/jquery/applications/commonext/data/helpdata/HELP_SETUP_profileCompany.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/commonext/data/helpdata/HELP_SETUP_profileCompany.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/commonext/data/helpdata/HELP_SETUP_profileCompany.xml (original) +++ ofbiz/branches/jquery/applications/commonext/data/helpdata/HELP_SETUP_profileCompany.xml Wed Aug 11 13:22:40 2010 @@ -27,4 +27,4 @@ This screen shows details of an individual profile. It displays specific information regarding the contact and profile information. The lower part of the screen shows the contact information details indicating the address , telephone number , or email used to communicate with your organization. </para> -</section> \ No newline at end of file +</section> Modified: ofbiz/branches/jquery/applications/commonext/documents/ApacheOfbiz.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/commonext/documents/ApacheOfbiz.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/commonext/documents/ApacheOfbiz.xml (original) +++ ofbiz/branches/jquery/applications/commonext/documents/ApacheOfbiz.xml Wed Aug 11 13:22:40 2010 @@ -45,7 +45,7 @@ If you want to contribute to this document, you are very welcome. Several possibilities exist: <orderedlist> - <listitem><para>Convert existing OFBiz documents on the <link xl:href="http://docs.ofbiz.org">OFBiz documentation site to the <link xl:href="http://docbook.org">docbook</link> format</link></para></listitem> + <listitem><para>Convert existing OFBiz documents on the <link xl:href="https://cwiki.apache.org/confluence/display/OFBADMIN/OFBiz+Documentation+Index">OFBiz documentation site</link> to the <link xl:href="http://docbook.org">docbookformat</link></para></listitem> <listitem><para>Write new document chapters for an OFBiz component</para></listitem> <listitem><para>Write new Help screens which can be inserted as sections in the document.</para></listitem> </orderedlist> @@ -59,4 +59,4 @@ <xi:include href="ApacheOfbizUser.xml"/> <xi:include href="ApacheOfbizTechnical.xml"/> -</set> \ No newline at end of file +</set> Modified: ofbiz/branches/jquery/applications/commonext/documents/ApacheOfbizTechnical.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/commonext/documents/ApacheOfbizTechnical.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/commonext/documents/ApacheOfbizTechnical.xml (original) +++ ofbiz/branches/jquery/applications/commonext/documents/ApacheOfbizTechnical.xml Wed Aug 11 13:22:40 2010 @@ -351,4 +351,4 @@ image=/boot/vmlinuzNew </appendix> -</book> \ No newline at end of file +</book> Modified: ofbiz/branches/jquery/applications/commonext/script/org/ofbiz/setup/SetupEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/commonext/script/org/ofbiz/setup/SetupEvents.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/commonext/script/org/ofbiz/setup/SetupEvents.xml (original) +++ ofbiz/branches/jquery/applications/commonext/script/org/ofbiz/setup/SetupEvents.xml Wed Aug 11 13:22:40 2010 @@ -738,4 +738,4 @@ <call-service service-name="createWebSite" in-map-name="parameters"/> </simple-method> -</simple-methods> \ No newline at end of file +</simple-methods> Modified: ofbiz/branches/jquery/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/FindFacility.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/FindFacility.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/FindFacility.groovy (original) +++ ofbiz/branches/jquery/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/FindFacility.groovy Wed Aug 11 13:22:40 2010 @@ -57,4 +57,4 @@ if("productstore".equals(tabButtonItemTo } context.facility = facility; context.facilityId = facilityId; -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProdCatalog.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProdCatalog.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProdCatalog.groovy (original) +++ ofbiz/branches/jquery/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProdCatalog.groovy Wed Aug 11 13:22:40 2010 @@ -122,4 +122,4 @@ return; } context.showErrorMsg = showErrorMsg; - } \ No newline at end of file + } Modified: ofbiz/branches/jquery/applications/commonext/webapp/ofbizsetup/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/commonext/webapp/ofbizsetup/WEB-INF/controller.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/commonext/webapp/ofbizsetup/WEB-INF/controller.xml (original) +++ ofbiz/branches/jquery/applications/commonext/webapp/ofbizsetup/WEB-INF/controller.xml Wed Aug 11 13:22:40 2010 @@ -237,4 +237,4 @@ <view-map name="LookupFacility" type="screen" page="component://product/widget/facility/LookupScreens.xml#LookupFacility"/> <view-map name="LookupPartyName" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyName"/> -</site-conf> \ No newline at end of file +</site-conf> Modified: ofbiz/branches/jquery/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml (original) +++ ofbiz/branches/jquery/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml Wed Aug 11 13:22:40 2010 @@ -106,4 +106,4 @@ <welcome-file>index.jsp</welcome-file> </welcome-file-list> -</web-app> \ No newline at end of file +</web-app> Modified: ofbiz/branches/jquery/applications/commonext/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/commonext/widget/CommonScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/commonext/widget/CommonScreens.xml (original) +++ ofbiz/branches/jquery/applications/commonext/widget/CommonScreens.xml Wed Aug 11 13:22:40 2010 @@ -110,4 +110,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/commonext/widget/SystemInfoScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/commonext/widget/SystemInfoScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/commonext/widget/SystemInfoScreens.xml (original) +++ ofbiz/branches/jquery/applications/commonext/widget/SystemInfoScreens.xml Wed Aug 11 13:22:40 2010 @@ -73,4 +73,4 @@ under the License. </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/CommonScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/CommonScreens.xml (original) +++ ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/CommonScreens.xml Wed Aug 11 13:22:40 2010 @@ -133,4 +133,4 @@ </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/Menus.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/Menus.xml (original) +++ ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/Menus.xml Wed Aug 11 13:22:40 2010 @@ -98,4 +98,4 @@ </link> </menu-item> </menu> -</menus> \ No newline at end of file +</menus> Modified: ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/ProfileScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/ProfileScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/ProfileScreens.xml (original) +++ ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/ProfileScreens.xml Wed Aug 11 13:22:40 2010 @@ -299,4 +299,4 @@ </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/SetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/SetupForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/SetupForms.xml (original) +++ ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/SetupForms.xml Wed Aug 11 13:22:40 2010 @@ -300,4 +300,4 @@ </hyperlink> </field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/SetupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/SetupScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/SetupScreens.xml (original) +++ ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/SetupScreens.xml Wed Aug 11 13:22:40 2010 @@ -346,4 +346,4 @@ </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/content/data/ContentPortletData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/data/ContentPortletData.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/data/ContentPortletData.xml (original) +++ ofbiz/branches/jquery/applications/content/data/ContentPortletData.xml Wed Aug 11 13:22:40 2010 @@ -25,4 +25,4 @@ screenName="ShowContentPortlet" screenLocation="component://content/widget/content/ContentScreens.xml" editFormName="EditShowContentPortlet" editFormLocation="component://content/widget/content/ContentForms.xml"/> <PortletPortletCategory portalPortletId="showContent" portletCategoryId="CONTENT"/> -</entity-engine-xml> \ No newline at end of file +</entity-engine-xml> Modified: ofbiz/branches/jquery/applications/content/data/SeedBlogData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/data/SeedBlogData.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/data/SeedBlogData.xml (original) +++ ofbiz/branches/jquery/applications/content/data/SeedBlogData.xml Wed Aug 11 13:22:40 2010 @@ -27,4 +27,4 @@ childBranchCount="1" childLeafCount="1"/> -</entity-engine-xml> \ No newline at end of file +</entity-engine-xml> Modified: ofbiz/branches/jquery/applications/content/data/WebtoolsHelpData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/data/WebtoolsHelpData.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/data/WebtoolsHelpData.xml (original) +++ ofbiz/branches/jquery/applications/content/data/WebtoolsHelpData.xml Wed Aug 11 13:22:40 2010 @@ -46,4 +46,4 @@ <ContentAssoc contentId="DOCUMENTS" contentIdTo="SELENIUM_HTTPS" contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01" sequenceNum="" /> - </entity-engine-xml> \ No newline at end of file + </entity-engine-xml> Modified: ofbiz/branches/jquery/applications/content/servicedef/services_data.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/servicedef/services_data.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/servicedef/services_data.xml (original) +++ ofbiz/branches/jquery/applications/content/servicedef/services_data.xml Wed Aug 11 13:22:40 2010 @@ -259,4 +259,4 @@ <auto-attributes include="pk" mode="IN" /> </service> -</services> \ No newline at end of file +</services> Modified: ofbiz/branches/jquery/applications/content/servicedef/services_website.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/servicedef/services_website.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/servicedef/services_website.xml (original) +++ ofbiz/branches/jquery/applications/content/servicedef/services_website.xml Wed Aug 11 13:22:40 2010 @@ -154,4 +154,4 @@ <attribute name="webSiteId" type="String" mode="IN" optional="false"/> <attribute name="webSiteContentTypeId" type="List" mode="IN" optional="false"/> </service> -</services> \ No newline at end of file +</services> Modified: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/ContentManagementWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/ContentManagementWorker.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/ContentManagementWorker.java (original) +++ ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/ContentManagementWorker.java Wed Aug 11 13:22:40 2010 @@ -46,8 +46,6 @@ import org.ofbiz.entity.GenericEntityExc import org.ofbiz.entity.GenericPK; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.condition.EntityCondition; -import org.ofbiz.entity.condition.EntityConditionList; -import org.ofbiz.entity.condition.EntityExpr; import org.ofbiz.entity.condition.EntityOperator; import org.ofbiz.entity.util.EntityUtil; import org.ofbiz.entityext.permission.EntityPermissionChecker; Modified: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java (original) +++ ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java Wed Aug 11 13:22:40 2010 @@ -21,10 +21,10 @@ package org.ofbiz.content.compdoc; import java.io.ByteArrayInputStream; import java.io.IOException; import java.nio.ByteBuffer; +import java.util.Iterator; import java.util.Locale; import java.util.Map; import java.util.Set; -import java.util.Iterator; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; @@ -34,12 +34,11 @@ import javax.servlet.http.HttpSession; import javolution.util.FastMap; import org.ofbiz.base.util.Debug; -import org.ofbiz.base.util.FileUtil; +import org.ofbiz.base.util.UtilFormatOut; import org.ofbiz.base.util.UtilHttp; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; -import org.ofbiz.base.util.UtilFormatOut; import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; Modified: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/content/ContentMapFacade.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/content/ContentMapFacade.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/content/ContentMapFacade.java (original) +++ ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/content/ContentMapFacade.java Wed Aug 11 13:22:40 2010 @@ -19,22 +19,12 @@ package org.ofbiz.content.content; -import org.ofbiz.entity.Delegator; -import org.ofbiz.entity.GenericValue; -import org.ofbiz.entity.GenericEntityException; -import org.ofbiz.entity.condition.EntityCondition; -import org.ofbiz.entity.util.EntityUtil; -import org.ofbiz.service.LocalDispatcher; -import org.ofbiz.webapp.control.RequestHandler; -import org.ofbiz.webapp.website.WebSiteWorker; -import org.ofbiz.base.util.UtilMisc; -import org.ofbiz.base.util.Debug; -import org.ofbiz.base.util.GeneralException; -import org.ofbiz.base.util.UtilValidate; -import org.ofbiz.content.data.DataResourceWorker; - -import java.util.*; import java.io.IOException; +import java.util.Collection; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -43,6 +33,19 @@ import javolution.util.FastList; import javolution.util.FastMap; import javolution.util.FastSet; +import org.ofbiz.base.util.Debug; +import org.ofbiz.base.util.GeneralException; +import org.ofbiz.base.util.UtilMisc; +import org.ofbiz.content.data.DataResourceWorker; +import org.ofbiz.entity.Delegator; +import org.ofbiz.entity.GenericEntityException; +import org.ofbiz.entity.GenericValue; +import org.ofbiz.entity.condition.EntityCondition; +import org.ofbiz.entity.util.EntityUtil; +import org.ofbiz.service.LocalDispatcher; +import org.ofbiz.webapp.control.RequestHandler; +import org.ofbiz.webapp.website.WebSiteWorker; + /** * ContentMapFacade */ Modified: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/content/ContentWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/content/ContentWorker.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/content/ContentWorker.java (original) +++ ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/content/ContentWorker.java Wed Aug 11 13:22:40 2010 @@ -60,7 +60,6 @@ import org.ofbiz.service.GenericServiceE import org.ofbiz.service.LocalDispatcher; import org.ofbiz.service.ModelService; import org.ofbiz.service.ServiceUtil; -import org.ofbiz.webapp.view.ApacheFopWorker; import org.xml.sax.InputSource; import org.xml.sax.SAXException; Modified: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java (original) +++ ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java Wed Aug 11 13:22:40 2010 @@ -18,11 +18,11 @@ *******************************************************************************/ package org.ofbiz.content.content; -import java.io.File; import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; @@ -30,6 +30,10 @@ import javax.servlet.http.HttpSession; import javolution.util.FastList; import javolution.util.FastMap; +import org.apache.commons.fileupload.FileItem; +import org.apache.commons.fileupload.FileUploadException; +import org.apache.commons.fileupload.disk.DiskFileItemFactory; +import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.FileUtil; import org.ofbiz.base.util.StringUtil; @@ -52,11 +56,6 @@ import org.ofbiz.service.ModelService; import org.ofbiz.service.ServiceAuthException; import org.ofbiz.service.ServiceUtil; -import org.apache.commons.fileupload.FileItem; -import org.apache.commons.fileupload.FileUploadException; -import org.apache.commons.fileupload.disk.DiskFileItemFactory; -import org.apache.commons.fileupload.servlet.ServletFileUpload; - /** * UploadContentAndImage Class Modified: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/data/DataEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/data/DataEvents.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/data/DataEvents.java (original) +++ ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/data/DataEvents.java Wed Aug 11 13:22:40 2010 @@ -19,8 +19,8 @@ package org.ofbiz.content.data; import java.io.IOException; -import java.io.OutputStream; import java.io.InputStream; +import java.io.OutputStream; import java.util.List; import java.util.Locale; import java.util.Map; @@ -38,7 +38,6 @@ import org.ofbiz.base.util.UtilPropertie import org.ofbiz.base.util.UtilValidate; import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; -import org.ofbiz.entity.GenericPK; import org.ofbiz.entity.GenericValue; import org.ofbiz.service.GenericServiceException; import org.ofbiz.service.LocalDispatcher; Modified: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java (original) +++ ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java Wed Aug 11 13:22:40 2010 @@ -31,7 +31,6 @@ import javolution.util.FastList; import javolution.util.FastMap; import org.ofbiz.base.util.Debug; -import org.ofbiz.base.util.FileUtil; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.StringUtil; import org.ofbiz.base.util.UtilDateTime; Modified: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java (original) +++ ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java Wed Aug 11 13:22:40 2010 @@ -20,7 +20,6 @@ package org.ofbiz.content.webapp.ftl; import java.io.IOException; import java.io.Writer; -import java.util.List; import java.util.Locale; import java.util.Map; @@ -31,16 +30,13 @@ import javolution.util.FastMap; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; -import org.ofbiz.base.util.UtilFormatOut; import org.ofbiz.base.util.UtilHttp; import org.ofbiz.base.util.UtilMisc; -import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.collections.MapStack; import org.ofbiz.base.util.template.FreeMarkerWorker; import org.ofbiz.content.content.ContentWorker; import org.ofbiz.entity.Delegator; -import org.ofbiz.entity.GenericValue; import org.ofbiz.service.LocalDispatcher; import freemarker.core.Environment; Modified: ofbiz/branches/jquery/applications/content/template/docbook/highlighting/c-hl.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/template/docbook/highlighting/c-hl.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/template/docbook/highlighting/c-hl.xml (original) +++ ofbiz/branches/jquery/applications/content/template/docbook/highlighting/c-hl.xml Wed Aug 11 13:22:40 2010 @@ -98,4 +98,4 @@ <keyword>volatile</keyword> <keyword>while</keyword> </highlighter> -</highlighters> \ No newline at end of file +</highlighters> Modified: ofbiz/branches/jquery/applications/content/template/docbook/highlighting/cpp-hl.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/template/docbook/highlighting/cpp-hl.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/template/docbook/highlighting/cpp-hl.xml (original) +++ ofbiz/branches/jquery/applications/content/template/docbook/highlighting/cpp-hl.xml Wed Aug 11 13:22:40 2010 @@ -147,4 +147,4 @@ Michiel Hendriks <elmuerte at users.sour <keyword>true</keyword> <keyword>wchar_t</keyword> </highlighter> -</highlighters> \ No newline at end of file +</highlighters> Modified: ofbiz/branches/jquery/applications/content/template/docbook/highlighting/csharp-hl.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/template/docbook/highlighting/csharp-hl.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/template/docbook/highlighting/csharp-hl.xml (original) +++ ofbiz/branches/jquery/applications/content/template/docbook/highlighting/csharp-hl.xml Wed Aug 11 13:22:40 2010 @@ -184,4 +184,4 @@ Michiel Hendriks <elmuerte at users.sour <keyword>where</keyword> <keyword>yield</keyword> </highlighter> -</highlighters> \ No newline at end of file +</highlighters> Modified: ofbiz/branches/jquery/applications/content/template/docbook/highlighting/delphi-hl.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/template/docbook/highlighting/delphi-hl.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/template/docbook/highlighting/delphi-hl.xml (original) +++ ofbiz/branches/jquery/applications/content/template/docbook/highlighting/delphi-hl.xml Wed Aug 11 13:22:40 2010 @@ -197,4 +197,4 @@ Michiel Hendriks <elmuerte at users.sour <keyword>writeonly</keyword> <ignoreCase /> </highlighter> -</highlighters> \ No newline at end of file +</highlighters> Modified: ofbiz/branches/jquery/applications/content/template/docbook/highlighting/ini-hl.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/template/docbook/highlighting/ini-hl.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/template/docbook/highlighting/ini-hl.xml (original) +++ ofbiz/branches/jquery/applications/content/template/docbook/highlighting/ini-hl.xml Wed Aug 11 13:22:40 2010 @@ -42,4 +42,4 @@ Michiel Hendriks <elmuerte at users.sour <style>attribute</style> <flags>MULTILINE</flags> </highlighter> -</highlighters> \ No newline at end of file +</highlighters> Modified: ofbiz/branches/jquery/applications/content/template/docbook/highlighting/java-hl.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/template/docbook/highlighting/java-hl.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/template/docbook/highlighting/java-hl.xml (original) +++ ofbiz/branches/jquery/applications/content/template/docbook/highlighting/java-hl.xml Wed Aug 11 13:22:40 2010 @@ -114,4 +114,4 @@ Michiel Hendriks <elmuerte at users.sour <keyword>volatile</keyword> <keyword>while</keyword> </highlighter> -</highlighters> \ No newline at end of file +</highlighters> Modified: ofbiz/branches/jquery/applications/content/template/docbook/highlighting/javascript-hl.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/template/docbook/highlighting/javascript-hl.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/template/docbook/highlighting/javascript-hl.xml (original) +++ ofbiz/branches/jquery/applications/content/template/docbook/highlighting/javascript-hl.xml Wed Aug 11 13:22:40 2010 @@ -144,4 +144,4 @@ Michiel Hendriks <elmuerte at users.sour <keyword>NaN</keyword> <keyword>undefined</keyword> </highlighter> -</highlighters> \ No newline at end of file +</highlighters> Modified: ofbiz/branches/jquery/applications/content/template/docbook/highlighting/m2-hl.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/template/docbook/highlighting/m2-hl.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/template/docbook/highlighting/m2-hl.xml (original) +++ ofbiz/branches/jquery/applications/content/template/docbook/highlighting/m2-hl.xml Wed Aug 11 13:22:40 2010 @@ -87,4 +87,4 @@ Michiel Hendriks <elmuerte at users.sour <keyword>with</keyword> <ignoreCase /> </highlighter> -</highlighters> \ No newline at end of file +</highlighters> Modified: ofbiz/branches/jquery/applications/content/template/docbook/highlighting/myxml-hl.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/template/docbook/highlighting/myxml-hl.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/template/docbook/highlighting/myxml-hl.xml (original) +++ ofbiz/branches/jquery/applications/content/template/docbook/highlighting/myxml-hl.xml Wed Aug 11 13:22:40 2010 @@ -113,4 +113,4 @@ </elementPrefix> </wholehighlighter> -</highlighters> \ No newline at end of file +</highlighters> Modified: ofbiz/branches/jquery/applications/content/template/docbook/highlighting/perl-hl.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/template/docbook/highlighting/perl-hl.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/template/docbook/highlighting/perl-hl.xml (original) +++ ofbiz/branches/jquery/applications/content/template/docbook/highlighting/perl-hl.xml Wed Aug 11 13:22:40 2010 @@ -117,4 +117,4 @@ Michiel Hendriks <elmuerte at users.sour <keyword>ge</keyword> <keyword>cmp</keyword> </highlighter> -</highlighters> \ No newline at end of file +</highlighters> Modified: ofbiz/branches/jquery/applications/content/template/docbook/highlighting/php-hl.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/template/docbook/highlighting/php-hl.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/template/docbook/highlighting/php-hl.xml (original) +++ ofbiz/branches/jquery/applications/content/template/docbook/highlighting/php-hl.xml Wed Aug 11 13:22:40 2010 @@ -146,4 +146,4 @@ Michiel Hendriks <elmuerte at users.sour <word><?=</word> <style>directive</style> </highlighter> -</highlighters> \ No newline at end of file +</highlighters> Modified: ofbiz/branches/jquery/applications/content/template/docbook/highlighting/python-hl.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/template/docbook/highlighting/python-hl.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/template/docbook/highlighting/python-hl.xml (original) +++ ofbiz/branches/jquery/applications/content/template/docbook/highlighting/python-hl.xml Wed Aug 11 13:22:40 2010 @@ -97,4 +97,4 @@ Michiel Hendriks <elmuerte at users.sour <keyword>lambda</keyword> <keyword>try</keyword> </highlighter> -</highlighters> \ No newline at end of file +</highlighters> Modified: ofbiz/branches/jquery/applications/content/template/docbook/highlighting/ruby-hl.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/template/docbook/highlighting/ruby-hl.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/template/docbook/highlighting/ruby-hl.xml (original) +++ ofbiz/branches/jquery/applications/content/template/docbook/highlighting/ruby-hl.xml Wed Aug 11 13:22:40 2010 @@ -106,4 +106,4 @@ Michiel Hendriks <elmuerte at users.sour <keyword>while</keyword> <keyword>yield</keyword> </highlighter> -</highlighters> \ No newline at end of file +</highlighters> Modified: ofbiz/branches/jquery/applications/content/template/docbook/highlighting/tcl-hl.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/template/docbook/highlighting/tcl-hl.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/template/docbook/highlighting/tcl-hl.xml (original) +++ ofbiz/branches/jquery/applications/content/template/docbook/highlighting/tcl-hl.xml Wed Aug 11 13:22:40 2010 @@ -177,4 +177,4 @@ freely, subject to the following restric <!-- Local Variables: mode: sgml coding: utf-8-unix sgml-indent-step: 2 sgml-indent-data: t sgml-set-face: t sgml-insert-missing-element-comment: nil End: - --> \ No newline at end of file + --> Modified: ofbiz/branches/jquery/applications/content/template/docbook/highlighting/xslthl-config.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/template/docbook/highlighting/xslthl-config.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/template/docbook/highlighting/xslthl-config.xml (original) +++ ofbiz/branches/jquery/applications/content/template/docbook/highlighting/xslthl-config.xml Wed Aug 11 13:22:40 2010 @@ -43,4 +43,4 @@ Michiel Hendriks <elmuerte at users.sour <highlighter id="perl" file="perl-hl.xml" /> <highlighter id="javascript" file="javascript-hl.xml" /> <namespace prefix="xslthl" uri="http://xslthl.sf.net" /> -</xslthl-config> \ No newline at end of file +</xslthl-config> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |