[OFBiz] SVN: r6835 - in trunk/specialized/opentravelsystem: script/org/ofbiz/opentravelsystem servicedef webapp/hotelbackend/script

[hansbak@svn.ofbiz.org]

Author: hansbak
Date: 2006-02-24 00:23:36 -0600 (Fri, 24 Feb 2006)
New Revision: 6835

Modified:
   trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/Utilities.xml
   trunk/specialized/opentravelsystem/servicedef/services.xml
   trunk/specialized/opentravelsystem/webapp/hotelbackend/script/partyFinancialHistory.bsh
Log:
OTS: fixing links to the ext accnt system.

Modified: trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/Utilities.xml
===================================================================
--- trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/Utilities.xml	2006-02-24 05:30:38 UTC (rev 6834)
+++ trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/Utilities.xml	2006-02-24 06:23:36 UTC (rev 6835)
@@ -274,7 +274,7 @@
          <iterate entry-name="payment" list-name="payments">
              <log level="always" message="Processing Payment ${payment.paymentId}"></log>
              <!-- only process fully applied payments -->
-             <set field="applied" value="${bsh:org.ofbiz.accounting.payment.PaymentExtWorker.getPaymentAppliedBd(payment)}" />
+             <set field="applied" value="${bsh:org.ofbiz.accounting.payment.PaymentWorker.getPaymentAppliedBd(payment)}" />
              <if-compare-field field-name="applied" operator="equals" to-field-name="payment.amount" type="Double">
                  <set field="updStatus.statusId" value="PMNT_CONFIRMED"/>
                  <set field="updStatus.paymentId" from-field="payment.paymentId"/>
@@ -294,7 +294,7 @@
              </condition-list>
          </entity-condition>
          <iterate entry-name="invoice" list-name="invoices">
-             <set field="notApplied" value="${bsh:org.ofbiz.accounting.invoice.InvoiceExtWorker.getInvoiceNotApplied(invoice)}"/>
+             <set field="notApplied" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(invoice)}"/>
              <log level="always" message="Looking at Invoice ${invoice.invoiceId} not applied value: ${notApplied}"></log>
              <if-compare field-name="notApplied" operator="equals" value="0.00"> <!-- only fully applied invoices required -->
                  <log level="always" message="Processing Invoice ${invoice.invoiceId}"></log>

Modified: trunk/specialized/opentravelsystem/servicedef/services.xml
===================================================================
--- trunk/specialized/opentravelsystem/servicedef/services.xml	2006-02-24 05:30:38 UTC (rev 6834)
+++ trunk/specialized/opentravelsystem/servicedef/services.xml	2006-02-24 06:23:36 UTC (rev 6835)
@@ -268,7 +268,7 @@
         location="org/ofbiz/accounting/payment/PaymentServicesExt.xml" invoke="createPayment" auth="true">
         <description>Create a Payment</description>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
-        <auto-attributes include="pk" mode="INOUT" optional="false"/>
+        <auto-attributes include="pk" mode="INOUT" optional="true"/>
         <override name="paymentTypeId" optional="false"/>
         <override name="paymentMethodTypeId" optional="false"/>
         <override name="partyIdFrom" optional="false"/>

Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/script/partyFinancialHistory.bsh
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/script/partyFinancialHistory.bsh	2006-02-24 05:30:38 UTC (rev 6834)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/script/partyFinancialHistory.bsh	2006-02-24 06:23:36 UTC (rev 6835)
@@ -79,7 +79,7 @@
 		invoice = inv.next();
 		if (invoice.getString("statusId").equals("INVOICE_CANCELLED")) continue;
 		BigDecimal invoiceAmount = InvoiceWorker.getInvoiceTotalBd(invoice).setScale(2,BigDecimal.ROUND_HALF_UP);
-		invoiceApplied = InvoiceExtWorker.getInvoiceAppliedBd(invoice).setScale(2,BigDecimal.ROUND_HALF_UP);
+		invoiceApplied = InvoiceWorker.getInvoiceAppliedBd(invoice).setScale(2,BigDecimal.ROUND_HALF_UP);
 /*		if (invoice.getString("partyId").equals(organizationPartyId)) { //negate for outgoing payments
 			invoiceAmount = invoiceAmount.multiply(new BigDecimal("-1"));
 			invoiceApplied = invoiceApplied.multiply(new BigDecimal("-1"));