Re: svn commit: r728176 - in /ofbiz/trunk/applications/accounting: script/org/ofbiz/accounting/payment/ webapp/accounting/invoice/ webapp/accounting/payment/ widget/ widget/ap/forms/ widget/ar/forms/

Mon, 05 Jan 2009 10:12:51 -0800 

Hi Scott,

Following your recent discussion with David, I think I will wait the merge. I 
could help then and especially after...

Thanks

Jacques

From: "Scott Gray" <[email protected]>

Hi Jacques
Thanks any help would be appreciated.  I won't have any more time to spend
on this for at least a fortnight and all my work is checked in so your free
to work on whatever you like.

I'm not entirely sure which components are still to go, I haven't really
been keeping track.  I do know for sure that I have completed the following:
accounting
content
ecommerce
manufacturing
order
product

Regards
Scott

2009/1/5 Jacques Le Roux <[email protected]>


Hi Scott,

If you give me some guidance I will help. I'd not like to get and
especially give you merging issues...

Thanks

Jacques

From: "Jacques Le Roux" <[email protected]>


Hi Scott,

I checked out and will have a look

Thanks

Jacques

From: "Scott Gray" <[email protected]>


Hi Jacques
Any help would be appreciated, there are still a number of components
which
need cleaning.

Many thanks
Scott

2008/12/20 Jacques Le Roux <[email protected]>

 OK no pb, reverted in revision: 728247


I thought it would be good to give the right type.
For instance getInvoiceNotApplied is returning a BigDecimal not a Double
But I must say I did not check them all (my changes I mean)

Anyway I understan it should be better done in typecheckcleanup200810.
Scott do you prefer to do it or that I do it myself ?

Thanks

Jacques

From: "David E Jones" <[email protected]>


 Jacques,


The Double to BigDecimal work is currently being done in the
 "typecheckcleanup200810" branch. The reason is that there are a LOT of
 changes to make, and many places where even Java types for entity
 engine
fields are changing. Making changes a little at a time has  proven to
be
problematic and painful, so in this branch we are taking  a bottom-up
approach and making it pretty comprehensive.

Unless there is a specific issue you're trying to address with this
 commit, I'd recommend reverting it and looking at the same changes in
 the
typecheckcleanup200810 branch. The full SVN URL for that branch is:

https://svn.apache.org/repos/asf/ofbiz/branches/typecheckcleanup200810

-David


On Dec 19, 2008, at 3:25 PM, [email protected] wrote:

 Author: jleroux


Date: Fri Dec 19 14:25:35 2008
New Revision: 728176

URL: http://svn.apache.org/viewvc?rev=728176&view=rev
Log:
Some BigDecimals in xml files

Modified:
 ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/
payment/PaymentServices.xml
 ofbiz/trunk/applications/accounting/webapp/accounting/invoice/
InvoiceForms.xml
 ofbiz/trunk/applications/accounting/webapp/accounting/payment/
PaymentForms.xml
 ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml
 ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
 ofbiz/trunk/applications/accounting/widget/
ReportFinancialSummaryForms.xml
 ofbiz/trunk/applications/accounting/widget/ap/forms/ InvoiceForms.xml
 ofbiz/trunk/applications/accounting/widget/ar/forms/ InvoiceForms.xml

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/
accounting/payment/PaymentServices.xml
URL:

http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=728176&r1=728175&r2=728176&view=diff
= = = = = = = =
======================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/
payment/PaymentServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/
payment/PaymentServices.xml Fri Dec 19 14:25:35 2008
@@ -145,7 +145,7 @@
          <entity-one entity-name="Invoice" value-name="invoice"/>

          <!-- get the amount that has not been applied yet for  the
invoice (outstanding amount) -->
-            <set field="notApplied" value="$ {bsh:org .ofbiz
.accounting
.invoice.InvoiceWorker.getInvoiceNotApplied(invoice).doubleValue()}"
 type="Double"/>
+            <set field="notApplied" value="$ {bsh:org .ofbiz
.accounting
.invoice.InvoiceWorker.getInvoiceNotApplied(invoice).doubleValue()}"
 type="BigDecimal"/>

          <!-- if the amount to apply goes over the outstanding
 amount,
then use the notApplied amount and log a warning -->
          <if-compare-field field="paymentAppl.amountApplied" to-
field="notApplied" operator="greater" type="Double">
@@ -186,7 +186,7 @@

                  <!-- check if the payment fully applied when set  to
confirmed-->
                  <if-compare field="parameters.statusId"
 operator="equals" value="PMNT_CONFIRMED">
-                        <set field="notYetApplied" value="$ {bsh:org
.ofbiz
.accounting.payment.PaymentWorker.getPaymentNotAppliedBd(payment)}"/>
+                        <set field="notYetApplied" value="$ {bsh:org
.ofbiz
.accounting.payment.PaymentWorker.getPaymentNotAppliedBd(payment)}"
 type="BigDecimal"/>
                      <if-compare field="notYetApplied"
 operator="greater" value="0.00">
                          <add-error><fail-property
 resource="AccountingUiLabels"
property="AccountingPSNotConfirmedNotFullyApplied"/></add-error>
                          <log level="error" message="Cannot  change
from ${payment.statusId} to ${parameters.statusId}, payment  not fully
applied: ${notYetapplied}"/>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/
invoice/InvoiceForms.xml
URL:

http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml?rev=728176&r1=728175&r2=728176&view=diff
= = = = = = = =
======================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/
InvoiceForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/
InvoiceForms.xml Fri Dec 19 14:25:35 2008
@@ -65,8 +65,8 @@
              <field-map field-name="compareDate" env-
name="invoiceDate"/>
              <field-map field-name="lastNameFirst" value="Y"/>
          </service>
-            <set field="amountToApply" value="$ {bsh:return (org
.ofbiz
.accounting
.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId));}"/>
-            <set field="total" value="$ {bsh:return (org .ofbiz
.accounting
.invoice.InvoiceWorker.getInvoiceTotal(delegator,invoiceId));}"/>
+            <set field="amountToApply" value="$ {bsh:return (org
.ofbiz
.accounting
.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId));}"
 type="BigDecimal"/>
+            <set field="total" value="$ {bsh:return (org .ofbiz
.accounting
.invoice.InvoiceWorker.getInvoiceTotal(delegator,invoiceId));}"
 type="BigDecimal"/>
      </row-actions>

      <field name="invoiceId" widget-style="buttontext">
@@ -88,7 +88,7 @@
      <actions>
          <set field="total" value="${bsh:
              import java.text.NumberFormat;
-                 return (NumberFormat .getNumberInstance (context
.get
(&quot ;locale &quot ;)).format (org .ofbiz
.accounting.invoice.InvoiceWorker.getInvoiceTotalBd(invoice)));}"/>
+                 return (NumberFormat .getNumberInstance (context
.get
(&quot ;locale &quot ;)).format (org .ofbiz
.accounting.invoice.InvoiceWorker.getInvoiceTotalBd(invoice)));}"
 type="BigDecimal"/>
          <service service-name="getPartyNameForDate" result-map-
name="partyNameResultFrom">
              <field-map field-name="partyId" env-
name="invoice.partyIdFrom"/>
              <field-map field-name="compareDate" env-
name="invoice.invoiceDate"/>
@@ -123,7 +123,7 @@
              import java.text.NumberFormat;
              if(quantity==null) quantity = 1;
              if(amount==null) amount = 0;
-                 return (NumberFormat .getNumberInstance
(context.get(&quot;locale&quot;)).format(quantity*amount));}"/>
+                 return (NumberFormat .getNumberInstance
(context.get(&quot;locale&quot;)).format(quantity*amount));}"
type="BigDecimal"/>
      </row-actions>
      <auto-fields-entity entity-name="InvoiceItem" default-field-
type="display"/>
      <field name="invoiceId"><hidden/></field>
@@ -295,7 +295,7 @@
         <set field="total" value="${bsh:
             import java.text.NumberFormat;
             if(quantity==null||quantity==0) quantity = 1;
-                return (NumberFormat .getNumberInstance
(context.get(&quot;locale&quot;)).format(quantity*amount));}"/>
+                return (NumberFormat .getNumberInstance
(context.get(&quot;locale&quot;)).format(quantity*amount));}"
type="BigDecimal"/>
     </row-actions>
     <field name="invoiceId"><hidden/></field>
     <field name="invoiceItemSeqId" widget-
style="buttontext"><hyperlink target="listInvoiceItems?invoiceId=$
{invoiceId}&amp;invoiceItemSeqId=${invoiceItemSeqId}" description="$
{invoiceItemSeqId}"/></field>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/
payment/PaymentForms.xml
URL:

http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml?rev=728176&r1=728175&r2=728176&view=diff
= = = = = = = =
======================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/payment/
PaymentForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/
PaymentForms.xml Fri Dec 19 14:25:35 2008
@@ -57,7 +57,7 @@
          </service>
      </actions>
      <row-actions>
-            <set field="amountToApply" value="$ {bsh:org .ofbiz
.accounting .payment
.PaymentWorker.getPaymentNotAppliedBd(delegator,paymentId);}"/>
+            <set field="amountToApply" value="$ {bsh:org .ofbiz
.accounting .payment
.PaymentWorker.getPaymentNotAppliedBd(delegator,paymentId);}"
 type="BigDecimal"/>
      </row-actions>
      <field name="paymentId" widget-style="buttontext">
          <hyperlink description="${paymentId}"
 target="paymentOverview?paymentId=${paymentId}"/>
@@ -402,7 +402,7 @@
          </entity-condition>
      </actions>
      <row-actions>
-            <set field="amountApplied" value="$ {bsh:org .ofbiz
.accounting.payment.PaymentWorker.getPaymentAppliedAmount(delegator,
 paymentApplicationId);}"/>
+            <set field="amountApplied" value="$ {bsh:org .ofbiz
.accounting.payment.PaymentWorker.getPaymentAppliedAmount(delegator,
 paymentApplicationId);}" type="BigDecimal"/>
      </row-actions>
      <auto-fields-entity entity-name="PaymentApplication" default-
field-type="display"/>
      <field name="paymentApplicationId"><hidden/></field>

Modified: ofbiz/trunk/applications/accounting/widget/
BillingAccountForms.xml
URL:

http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml?rev=728176&r1=728175&r2=728176&view=diff
= = = = = = = =
======================================================================
--- ofbiz/trunk/applications/accounting/widget/
BillingAccountForms.xml
(original)
+++ ofbiz/trunk/applications/accounting/widget/
BillingAccountForms.xml
Fri Dec 19 14:25:35 2008
@@ -73,10 +73,10 @@
          <set field="paidInvoice" value="${bsh:  org .ofbiz
.accounting
.invoice .InvoiceWorker .getInvoiceNotApplied
(delegator,invoiceId).compareTo(BigDecimal.ZERO)==0}" type="Boolean"/>
          <set field="amountToApply" value="${bsh:
              import java.text.NumberFormat;
-                 return (NumberFormat .getNumberInstance (context
.get
(&quot ;locale &quot ;)).format (org .ofbiz .accounting .invoice
.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/>
+                 return (NumberFormat .getNumberInstance (context
.get
(&quot ;locale &quot ;)).format (org .ofbiz .accounting .invoice
.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"
 type="BigDecimal"/>
          <set field="total" value="${bsh:
              import java.text.NumberFormat;
-                 return (NumberFormat .getNumberInstance (context
.get
(&quot ;locale &quot ;)).format (org .ofbiz .accounting
.invoice.InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)));}"/>
+                 return (NumberFormat .getNumberInstance (context
.get
(&quot ;locale &quot ;)).format (org .ofbiz .accounting
.invoice.InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)));}"
 type="BigDecimal"/>
      </row-actions>
      <field name="billingAccountId"><hidden/></field>
      <field name="invoiceId" widget-style="buttontext">

Modified: ofbiz/trunk/applications/accounting/widget/
PaymentScreens.xml
URL:

http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=728176&r1=728175&r2=728176&view=diff
= = = = = = = =
======================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
 (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml  Fri
Dec 19 14:25:35 2008
@@ -316,8 +316,8 @@
              <set field="labelTitleProperty"
 value="PageTitlePaymentOverview"/>
              <set field="paymentId" from-
field="parameters.paymentId"/>
              <entity-one entity-name="Payment" value-
name="payment"/>
-                <set field="appliedAmount" value="$ {bsh:org .ofbiz
.accounting
.payment.PaymentWorker.getPaymentAppliedBd(payment).toString()}"/>
-                <set field="notAppliedAmount" value="$ {bsh:org
.ofbiz
.accounting
.payment.PaymentWorker.getPaymentNotAppliedBd(payment).toString()}"/>
+                <set field="appliedAmount" value="$ {bsh:org .ofbiz
.accounting
.payment.PaymentWorker.getPaymentAppliedBd(payment).toString()}"
 type="BigDecimal"/>
+                <set field="notAppliedAmount" value="$ {bsh:org
.ofbiz
.accounting
.payment.PaymentWorker.getPaymentNotAppliedBd(payment).toString()}"
 type="BigDecimal"/>
          </actions>
          <widgets>
              <decorator-screen name="CommonPaymentDecorator"
 location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/applications/accounting/widget/
ReportFinancialSummaryForms.xml
URL:

http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml?rev=728176&r1=728175&r2=728176&view=diff
= = = = = = = =
======================================================================
--- ofbiz/trunk/applications/accounting/widget/
ReportFinancialSummaryForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/
ReportFinancialSummaryForms.xml Fri Dec 19 14:25:35 2008
@@ -83,8 +83,8 @@
          <set field="showCredit" value="${bsh:(postedBalance  &gt;= 0
&amp;&amp;
org.ofbiz.accounting.util.UtilAccounting.isCreditAccount(glAccount))
 ||
(postedBalance &lt; 0 &amp;&amp;  org
.ofbiz.accounting.util.UtilAccounting.isDebitAccount(glAccount))}"
 type="Boolean"/>
          <set field="absolutePostedBalance" value="${bsh:
(postedBalance &gt;= 0? postedBalance: (-1)*postedBalance)}"
type="BigDecimal"/>
          <set field="showTotals" value="${bsh:(isLastRow != null
 &amp;&amp; isLastRow==true)}" type="Boolean"/>
-            <set field="debitTotal" from-
field="parameters.debitTotal"
type="Double"/>
-            <set field="creditTotal" from-
field="parameters.creditTotal" type="Double"/>
+            <set field="debitTotal" from-
field="parameters.debitTotal"
type="BigDecimal"/>
+            <set field="creditTotal" from-
field="parameters.creditTotal" type="BigDecimal"/>
          <set field="parameters.debitTotal" value="${bsh: (showDebit?
(debitTotal + absolutePostedBalance): (debitTotal))}"
type="BigDecimal"/>
          <set field="parameters.creditTotal" value="${bsh:
(showCredit?
(creditTotal + absolutePostedBalance): (creditTotal))}"
 type="BigDecimal"/>
      </row-actions>

Modified: ofbiz/trunk/applications/accounting/widget/ap/forms/
InvoiceForms.xml
URL:

http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml?rev=728176&r1=728175&r2=728176&view=diff
= = = = = = = =
======================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/forms/
InvoiceForms.xml
(original)
+++ ofbiz/trunk/applications/accounting/widget/ap/forms/
InvoiceForms.xml
Fri Dec 19 14:25:35 2008
@@ -45,10 +45,10 @@
          </service>
          <set field="amountToApply" value="${bsh:
              import java.text.NumberFormat;
-                 return (NumberFormat .getNumberInstance (context
.get
(&quot ;locale &quot ;)).format (org .ofbiz .accounting .invoice
.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/>
+                 return (NumberFormat .getNumberInstance (context
.get
(&quot ;locale &quot ;)).format (org .ofbiz .accounting .invoice
.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"
 type="BigDecimal"/>
          <set field="total" value="${bsh:
              import java.text.NumberFormat;
-                 return (NumberFormat .getNumberInstance (context
.get
(&quot ;locale &quot ;)).format (org .ofbiz .accounting
.invoice.InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)));}"/>
+                 return (NumberFormat .getNumberInstance (context
.get
(&quot ;locale &quot ;)).format (org .ofbiz .accounting
.invoice.InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)));}"
 type="BigDecimal"/>
      </row-actions>
      <field name="invoiceId" widget-style="buttontext">
          <hyperlink description="${invoiceId}"
 target="invoiceOverview?invoiceId=${invoiceId}"/>

Modified: ofbiz/trunk/applications/accounting/widget/ar/forms/
InvoiceForms.xml
URL:

http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml?rev=728176&r1=728175&r2=728176&view=diff
= = = = = = = =
======================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/forms/
InvoiceForms.xml
(original)
+++ ofbiz/trunk/applications/accounting/widget/ar/forms/
InvoiceForms.xml
Fri Dec 19 14:25:35 2008
@@ -46,10 +46,10 @@
          </service>
          <set field="amountToApply" value="${bsh:
              import java.text.NumberFormat;
-                 return (NumberFormat .getNumberInstance (context
.get
(&quot ;locale &quot ;)).format (org .ofbiz .accounting .invoice
.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/>
+                 return (NumberFormat .getNumberInstance (context
.get
(&quot ;locale &quot ;)).format (org .ofbiz .accounting .invoice
.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"
 type="BigDecimal"/>
          <set field="total" value="${bsh:
              import java.text.NumberFormat;
-                 return (NumberFormat .getNumberInstance (context
.get
(&quot ;locale &quot ;)).format (org .ofbiz .accounting
.invoice.InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)));}"/>
+                 return (NumberFormat .getNumberInstance (context
.get
(&quot ;locale &quot ;)).format (org .ofbiz .accounting
.invoice.InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)));}"
 type="BigDecimal"/>
      </row-actions>
      <field name="invoiceId" widget-style="buttontext">
          <hyperlink description="${invoiceId}"
 target="invoiceOverview?invoiceId=${invoiceId}"/>

Reply via email to