Re: svn commit: r728176 - in /ofbiz/trunk/applications/acco
Locked
Re: svn commit: r728176 - in /ofbiz/trunk/applications/acco
 
Administrator
|
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" <[hidden email]> > Hi Scott, > > I checked out and will have a look > > Thanks > > Jacques > > From: "Scott Gray" <[hidden email]> >> 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 <[hidden email]> >> >>> 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" <[hidden email]> >>> >>> >>>> 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, [hidden email] 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 >>>>> (" ;locale " ;)).format (org .ofbiz >>>>> .accounting.invoice.InvoiceWorker.getInvoiceTotalBd(invoice)));}"/> >>>>> + return (NumberFormat .getNumberInstance (context .get >>>>> (" ;locale " ;)).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("locale")).format(quantity*amount));}"/> >>>>> + return (NumberFormat .getNumberInstance >>>>> (context.get("locale")).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("locale")).format(quantity*amount));}"/> >>>>> + return (NumberFormat .getNumberInstance >>>>> (context.get("locale")).format(quantity*amount));}" >>>>> type="BigDecimal"/> >>>>> </row-actions> >>>>> <field name="invoiceId"><hidden/></field> >>>>> <field name="invoiceItemSeqId" widget- >>>>> style="buttontext"><hyperlink target="listInvoiceItems?invoiceId=$ >>>>> {invoiceId}&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 >>>>> (" ;locale " ;)).format (org .ofbiz .accounting .invoice >>>>> .InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/> >>>>> + return (NumberFormat .getNumberInstance (context .get >>>>> (" ;locale " ;)).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 >>>>> (" ;locale " ;)).format (org .ofbiz .accounting >>>>> .invoice.InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)));}"/> >>>>> + return (NumberFormat .getNumberInstance (context .get >>>>> (" ;locale " ;)).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 >= 0 >>>>> && >>>>> org.ofbiz.accounting.util.UtilAccounting.isCreditAccount(glAccount)) || >>>>> (postedBalance < 0 && org >>>>> .ofbiz.accounting.util.UtilAccounting.isDebitAccount(glAccount))}" >>>>> type="Boolean"/> >>>>> <set field="absolutePostedBalance" value="${bsh: >>>>> (postedBalance >= 0? postedBalance: (-1)*postedBalance)}" >>>>> type="BigDecimal"/> >>>>> <set field="showTotals" value="${bsh:(isLastRow != null >>>>> && 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 >>>>> (" ;locale " ;)).format (org .ofbiz .accounting .invoice >>>>> .InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/> >>>>> + return (NumberFormat .getNumberInstance (context .get >>>>> (" ;locale " ;)).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 >>>>> (" ;locale " ;)).format (org .ofbiz .accounting >>>>> .invoice.InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)));}"/> >>>>> + return (NumberFormat .getNumberInstance (context .get >>>>> (" ;locale " ;)).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 >>>>> (" ;locale " ;)).format (org .ofbiz .accounting .invoice >>>>> .InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/> >>>>> + return (NumberFormat .getNumberInstance (context .get >>>>> (" ;locale " ;)).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 >>>>> (" ;locale " ;)).format (org .ofbiz .accounting >>>>> .invoice.InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)));}"/> >>>>> + return (NumberFormat .getNumberInstance (context .get >>>>> (" ;locale " ;)).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}"/> >>>>> >>>>> >>>>> >>>> >>> >> > |
Re: svn commit: r728176 - in /ofbiz/trunk/applications/acco
|
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 <[hidden email]> > 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" <[hidden email]> > >> Hi Scott, >> >> I checked out and will have a look >> >> Thanks >> >> Jacques >> >> From: "Scott Gray" <[hidden email]> >> >>> 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 <[hidden email]> >>> >>> 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" <[hidden email]> >>>> >>>> >>>> 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, [hidden email] 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 >>>>>> (" ;locale " ;)).format (org .ofbiz >>>>>> .accounting.invoice.InvoiceWorker.getInvoiceTotalBd(invoice)));}"/> >>>>>> + return (NumberFormat .getNumberInstance (context >>>>>> .get >>>>>> (" ;locale " ;)).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("locale")).format(quantity*amount));}"/> >>>>>> + return (NumberFormat .getNumberInstance >>>>>> (context.get("locale")).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("locale")).format(quantity*amount));}"/> >>>>>> + return (NumberFormat .getNumberInstance >>>>>> (context.get("locale")).format(quantity*amount));}" >>>>>> type="BigDecimal"/> >>>>>> </row-actions> >>>>>> <field name="invoiceId"><hidden/></field> >>>>>> <field name="invoiceItemSeqId" widget- >>>>>> style="buttontext"><hyperlink target="listInvoiceItems?invoiceId=$ >>>>>> {invoiceId}&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 >>>>>> (" ;locale " ;)).format (org .ofbiz .accounting .invoice >>>>>> .InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/> >>>>>> + return (NumberFormat .getNumberInstance (context >>>>>> .get >>>>>> (" ;locale " ;)).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 >>>>>> (" ;locale " ;)).format (org .ofbiz .accounting >>>>>> .invoice.InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)));}"/> >>>>>> + return (NumberFormat .getNumberInstance (context >>>>>> .get >>>>>> (" ;locale " ;)).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 >= 0 >>>>>> && >>>>>> org.ofbiz.accounting.util.UtilAccounting.isCreditAccount(glAccount)) >>>>>> || >>>>>> (postedBalance < 0 && org >>>>>> .ofbiz.accounting.util.UtilAccounting.isDebitAccount(glAccount))}" >>>>>> type="Boolean"/> >>>>>> <set field="absolutePostedBalance" value="${bsh: >>>>>> (postedBalance >= 0? postedBalance: (-1)*postedBalance)}" >>>>>> type="BigDecimal"/> >>>>>> <set field="showTotals" value="${bsh:(isLastRow != null >>>>>> && 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 >>>>>> (" ;locale " ;)).format (org .ofbiz .accounting .invoice >>>>>> .InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/> >>>>>> + return (NumberFormat .getNumberInstance (context >>>>>> .get >>>>>> (" ;locale " ;)).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 >>>>>> (" ;locale " ;)).format (org .ofbiz .accounting >>>>>> .invoice.InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)));}"/> >>>>>> + return (NumberFormat .getNumberInstance (context >>>>>> .get >>>>>> (" ;locale " ;)).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 >>>>>> (" ;locale " ;)).format (org .ofbiz .accounting .invoice >>>>>> .InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/> >>>>>> + return (NumberFormat .getNumberInstance (context >>>>>> .get >>>>>> (" ;locale " ;)).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 >>>>>> (" ;locale " ;)).format (org .ofbiz .accounting >>>>>> .invoice.InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)));}"/> >>>>>> + return (NumberFormat .getNumberInstance (context >>>>>> .get >>>>>> (" ;locale " ;)).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}"/> >>>>>> >>>>>> >>>>>> >>>>>> >>>>> >>>> >>> >> > |
Re: svn commit: r728176 - in /ofbiz/trunk/applications/acco
|
|
Scott, What is next on your list... or if you had more time what would you work on next? I ask because I'm wondering if it is far enough a long to just merge back into the trunk and continue work from there? If most stuff is working and there aren't too many warnings in the logs, it might be well worth getting out to everyone to help refine it and find anything smaller that might be missing. -David On Jan 4, 2009, at 3:59 PM, Scott Gray wrote: > 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 <[hidden email]> > >> 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" <[hidden email]> >> >>> Hi Scott, >>> >>> I checked out and will have a look >>> >>> Thanks >>> >>> Jacques >>> >>> From: "Scott Gray" <[hidden email]> >>> >>>> 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 <[hidden email]> >>>> >>>> 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" <[hidden email]> >>>>> >>>>> >>>>> 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, [hidden email] 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 >>>>>>> (" ;locale " ;)).format (org .ofbiz >>>>>>> .accounting >>>>>>> .invoice.InvoiceWorker.getInvoiceTotalBd(invoice)));}"/> >>>>>>> + return (NumberFormat .getNumberInstance >>>>>>> (context >>>>>>> .get >>>>>>> (" ;locale " ;)).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("locale")).format(quantity*amount));}"/> >>>>>>> + return (NumberFormat .getNumberInstance >>>>>>> (context.get("locale")).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("locale")).format(quantity*amount));}"/> >>>>>>> + return (NumberFormat .getNumberInstance >>>>>>> (context.get("locale")).format(quantity*amount));}" >>>>>>> type="BigDecimal"/> >>>>>>> </row-actions> >>>>>>> <field name="invoiceId"><hidden/></field> >>>>>>> <field name="invoiceItemSeqId" widget- >>>>>>> style="buttontext"><hyperlink target="listInvoiceItems? >>>>>>> invoiceId=$ >>>>>>> {invoiceId}&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 >>>>>>> (" ;locale " ;)).format (org .ofbiz .accounting .invoice >>>>>>> .InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/> >>>>>>> + return (NumberFormat .getNumberInstance >>>>>>> (context >>>>>>> .get >>>>>>> (" ;locale " ;)).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 >>>>>>> (" ;locale " ;)).format (org .ofbiz .accounting >>>>>>> .invoice >>>>>>> .InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)));}"/> >>>>>>> + return (NumberFormat .getNumberInstance >>>>>>> (context >>>>>>> .get >>>>>>> (" ;locale " ;)).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 >>>>>>> >= 0 >>>>>>> && >>>>>>> org >>>>>>> .ofbiz >>>>>>> .accounting.util.UtilAccounting.isCreditAccount(glAccount)) >>>>>>> || >>>>>>> (postedBalance < 0 && org >>>>>>> .ofbiz >>>>>>> .accounting.util.UtilAccounting.isDebitAccount(glAccount))}" >>>>>>> type="Boolean"/> >>>>>>> <set field="absolutePostedBalance" value="${bsh: >>>>>>> (postedBalance >= 0? postedBalance: (-1)*postedBalance)}" >>>>>>> type="BigDecimal"/> >>>>>>> <set field="showTotals" value="${bsh:(isLastRow != null >>>>>>> && 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 >>>>>>> (" ;locale " ;)).format (org .ofbiz .accounting .invoice >>>>>>> .InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/> >>>>>>> + return (NumberFormat .getNumberInstance >>>>>>> (context >>>>>>> .get >>>>>>> (" ;locale " ;)).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 >>>>>>> (" ;locale " ;)).format (org .ofbiz .accounting >>>>>>> .invoice >>>>>>> .InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)));}"/> >>>>>>> + return (NumberFormat .getNumberInstance >>>>>>> (context >>>>>>> .get >>>>>>> (" ;locale " ;)).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 >>>>>>> (" ;locale " ;)).format (org .ofbiz .accounting .invoice >>>>>>> .InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/> >>>>>>> + return (NumberFormat .getNumberInstance >>>>>>> (context >>>>>>> .get >>>>>>> (" ;locale " ;)).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 >>>>>>> (" ;locale " ;)).format (org .ofbiz .accounting >>>>>>> .invoice >>>>>>> .InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)));}"/> >>>>>>> + return (NumberFormat .getNumberInstance >>>>>>> (context >>>>>>> .get >>>>>>> (" ;locale " ;)).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}"/> >>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>>> >>>>> >>>> >>> >> |
Re: svn commit: r728176 - in /ofbiz/trunk/applications/acco
|
|
Hi David,
To be honest I have no idea what I would have worked on next, I generally just run a search for the word "double" and then start plugging away. I think it would be fine to merge back into the trunk but I have to admit I haven't spent much time testing that everything is working ok. I got half way through fixing the unit tests in the trunk yesterday and was planning to finish that this week and then merge it into the clean up branch so I could run a few tests on the work so far. I would definitely prefer to have everything in the trunk, but I can't say how smoothly everything will run other than I *think* it will be ok. The issue would be is anyone willing to do the merge? I'm guessing it will be relatively time consuming considering that it's been about 4 months since the branch was created. I'm happy to take care of it but once again I won't have time during the next couple of weeks. Regards Scott 2009/1/5 David E Jones <[hidden email]> > > Scott, > > What is next on your list... or if you had more time what would you work on > next? > > I ask because I'm wondering if it is far enough a long to just merge back > into the trunk and continue work from there? If most stuff is working and > there aren't too many warnings in the logs, it might be well worth getting > out to everyone to help refine it and find anything smaller that might be > missing. > > -David > > > > On Jan 4, 2009, at 3:59 PM, Scott Gray wrote: > > 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 <[hidden email]> >> >> 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" <[hidden email]> >>> >>> Hi Scott, >>>> >>>> I checked out and will have a look >>>> >>>> Thanks >>>> >>>> Jacques >>>> >>>> From: "Scott Gray" <[hidden email]> >>>> >>>> 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 <[hidden email]> >>>>> >>>>> 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" <[hidden email]> >>>>>> >>>>>> >>>>>> 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, [hidden email] 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 >>>>>>>> (" ;locale " ;)).format (org .ofbiz >>>>>>>> .accounting.invoice.InvoiceWorker.getInvoiceTotalBd(invoice)));}"/> >>>>>>>> + return (NumberFormat .getNumberInstance (context >>>>>>>> .get >>>>>>>> (" ;locale " ;)).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("locale")).format(quantity*amount));}"/> >>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>> (context.get("locale")).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("locale")).format(quantity*amount));}"/> >>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>> (context.get("locale")).format(quantity*amount));}" >>>>>>>> type="BigDecimal"/> >>>>>>>> </row-actions> >>>>>>>> <field name="invoiceId"><hidden/></field> >>>>>>>> <field name="invoiceItemSeqId" widget- >>>>>>>> style="buttontext"><hyperlink target="listInvoiceItems?invoiceId=$ >>>>>>>> {invoiceId}&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 >>>>>>>> (" ;locale " ;)).format (org .ofbiz .accounting .invoice >>>>>>>> .InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/> >>>>>>>> + return (NumberFormat .getNumberInstance (context >>>>>>>> .get >>>>>>>> (" ;locale " ;)).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 >>>>>>>> (" ;locale " ;)).format (org .ofbiz .accounting >>>>>>>> .invoice.InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)));}"/> >>>>>>>> + return (NumberFormat .getNumberInstance (context >>>>>>>> .get >>>>>>>> (" ;locale " ;)).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 >= 0 >>>>>>>> && >>>>>>>> org.ofbiz.accounting.util.UtilAccounting.isCreditAccount(glAccount)) >>>>>>>> || >>>>>>>> (postedBalance < 0 && org >>>>>>>> .ofbiz.accounting.util.UtilAccounting.isDebitAccount(glAccount))}" >>>>>>>> type="Boolean"/> >>>>>>>> <set field="absolutePostedBalance" value="${bsh: >>>>>>>> (postedBalance >= 0? postedBalance: (-1)*postedBalance)}" >>>>>>>> type="BigDecimal"/> >>>>>>>> <set field="showTotals" value="${bsh:(isLastRow != null >>>>>>>> && 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 >>>>>>>> (" ;locale " ;)).format (org .ofbiz .accounting .invoice >>>>>>>> .InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/> >>>>>>>> + return (NumberFormat .getNumberInstance (context >>>>>>>> .get >>>>>>>> (" ;locale " ;)).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 >>>>>>>> (" ;locale " ;)).format (org .ofbiz .accounting >>>>>>>> .invoice.InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)));}"/> >>>>>>>> + return (NumberFormat .getNumberInstance (context >>>>>>>> .get >>>>>>>> (" ;locale " ;)).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 >>>>>>>> (" ;locale " ;)).format (org .ofbiz .accounting .invoice >>>>>>>> .InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/> >>>>>>>> + return (NumberFormat .getNumberInstance (context >>>>>>>> .get >>>>>>>> (" ;locale " ;)).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 >>>>>>>> (" ;locale " ;)).format (org .ofbiz .accounting >>>>>>>> .invoice.InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)));}"/> >>>>>>>> + return (NumberFormat .getNumberInstance (context >>>>>>>> .get >>>>>>>> (" ;locale " ;)).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}"/> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> >>>>>> >>>>> >>>> >>> > |
Re: svn commit: r728176 - in /ofbiz/trunk/applications/acco
|
Administrator
|
In reply to this post by Scott Gray
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" <[hidden email]> > 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 <[hidden email]> > >> 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" <[hidden email]> >> >>> Hi Scott, >>> >>> I checked out and will have a look >>> >>> Thanks >>> >>> Jacques >>> >>> From: "Scott Gray" <[hidden email]> >>> >>>> 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 <[hidden email]> >>>> >>>> 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" <[hidden email]> >>>>> >>>>> >>>>> 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, [hidden email] 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 >>>>>>> (" ;locale " ;)).format (org .ofbiz >>>>>>> .accounting.invoice.InvoiceWorker.getInvoiceTotalBd(invoice)));}"/> >>>>>>> + return (NumberFormat .getNumberInstance (context >>>>>>> .get >>>>>>> (" ;locale " ;)).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("locale")).format(quantity*amount));}"/> >>>>>>> + return (NumberFormat .getNumberInstance >>>>>>> (context.get("locale")).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("locale")).format(quantity*amount));}"/> >>>>>>> + return (NumberFormat .getNumberInstance >>>>>>> (context.get("locale")).format(quantity*amount));}" >>>>>>> type="BigDecimal"/> >>>>>>> </row-actions> >>>>>>> <field name="invoiceId"><hidden/></field> >>>>>>> <field name="invoiceItemSeqId" widget- >>>>>>> style="buttontext"><hyperlink target="listInvoiceItems?invoiceId=$ >>>>>>> {invoiceId}&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 >>>>>>> (" ;locale " ;)).format (org .ofbiz .accounting .invoice >>>>>>> .InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/> >>>>>>> + return (NumberFormat .getNumberInstance (context >>>>>>> .get >>>>>>> (" ;locale " ;)).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 >>>>>>> (" ;locale " ;)).format (org .ofbiz .accounting >>>>>>> .invoice.InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)));}"/> >>>>>>> + return (NumberFormat .getNumberInstance (context >>>>>>> .get >>>>>>> (" ;locale " ;)).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 >= 0 >>>>>>> && >>>>>>> org.ofbiz.accounting.util.UtilAccounting.isCreditAccount(glAccount)) >>>>>>> || >>>>>>> (postedBalance < 0 && org >>>>>>> .ofbiz.accounting.util.UtilAccounting.isDebitAccount(glAccount))}" >>>>>>> type="Boolean"/> >>>>>>> <set field="absolutePostedBalance" value="${bsh: >>>>>>> (postedBalance >= 0? postedBalance: (-1)*postedBalance)}" >>>>>>> type="BigDecimal"/> >>>>>>> <set field="showTotals" value="${bsh:(isLastRow != null >>>>>>> && 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 >>>>>>> (" ;locale " ;)).format (org .ofbiz .accounting .invoice >>>>>>> .InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/> >>>>>>> + return (NumberFormat .getNumberInstance (context >>>>>>> .get >>>>>>> (" ;locale " ;)).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 >>>>>>> (" ;locale " ;)).format (org .ofbiz .accounting >>>>>>> .invoice.InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)));}"/> >>>>>>> + return (NumberFormat .getNumberInstance (context >>>>>>> .get >>>>>>> (" ;locale " ;)).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 >>>>>>> (" ;locale " ;)).format (org .ofbiz .accounting .invoice >>>>>>> .InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/> >>>>>>> + return (NumberFormat .getNumberInstance (context >>>>>>> .get >>>>>>> (" ;locale " ;)).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 >>>>>>> (" ;locale " ;)).format (org .ofbiz .accounting >>>>>>> .invoice.InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)));}"/> >>>>>>> + return (NumberFormat .getNumberInstance (context >>>>>>> .get >>>>>>> (" ;locale " ;)).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}"/> >>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>>> >>>>> >>>> >>> >> > |
Re: svn commit: r728176 - in /ofbiz/trunk/applications/acco
|
|
In reply to this post by Scott Gray
The approach I was taking was a bit different (I think). I was starting at the data model and looking at the fields that made more sense as a fixed-point instead of a floating point, then changing that in the data model and working up from there with services and so on. I'll play with the merge today and see how it looks. If it's not too much work I may just go for it, and then like Jacques mentioned he and others can get involved more easily. Before doing the merge I'll make sure at least the basics of order placement and fulfillment and such and all of the various things they trigger and get going. -David On Jan 4, 2009, at 6:28 PM, Scott Gray wrote: > Hi David, > To be honest I have no idea what I would have worked on next, I > generally > just run a search for the word "double" and then start plugging away. > > I think it would be fine to merge back into the trunk but I have to > admit I > haven't spent much time testing that everything is working ok. I > got half > way through fixing the unit tests in the trunk yesterday and was > planning to > finish that this week and then merge it into the clean up branch so > I could > run a few tests on the work so far. I would definitely prefer to have > everything in the trunk, but I can't say how smoothly everything > will run > other than I *think* it will be ok. > > The issue would be is anyone willing to do the merge? I'm guessing > it will > be relatively time consuming considering that it's been about 4 > months since > the branch was created. I'm happy to take care of it but once again > I won't > have time during the next couple of weeks. > > Regards > Scott > > 2009/1/5 David E Jones <[hidden email]> > >> >> Scott, >> >> What is next on your list... or if you had more time what would you >> work on >> next? >> >> I ask because I'm wondering if it is far enough a long to just >> merge back >> into the trunk and continue work from there? If most stuff is >> working and >> there aren't too many warnings in the logs, it might be well worth >> getting >> out to everyone to help refine it and find anything smaller that >> might be >> missing. >> >> -David >> >> >> >> On Jan 4, 2009, at 3:59 PM, Scott Gray wrote: >> >> 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 <[hidden email]> >>> >>> 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" <[hidden email]> >>>> >>>> Hi Scott, >>>>> >>>>> I checked out and will have a look >>>>> >>>>> Thanks >>>>> >>>>> Jacques >>>>> >>>>> From: "Scott Gray" <[hidden email]> >>>>> >>>>> 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 <[hidden email]> >>>>>> >>>>>> 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" <[hidden email]> >>>>>>> >>>>>>> >>>>>>> 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, [hidden email] 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 >>>>>>>>> (" ;locale " ;)).format (org .ofbiz >>>>>>>>> .accounting >>>>>>>>> .invoice.InvoiceWorker.getInvoiceTotalBd(invoice)));}"/> >>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>> (context >>>>>>>>> .get >>>>>>>>> (" ;locale " ;)).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("locale")).format(quantity*amount));}"/> >>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>> (context.get("locale")).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("locale")).format(quantity*amount));}"/> >>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>> (context.get("locale")).format(quantity*amount));}" >>>>>>>>> type="BigDecimal"/> >>>>>>>>> </row-actions> >>>>>>>>> <field name="invoiceId"><hidden/></field> >>>>>>>>> <field name="invoiceItemSeqId" widget- >>>>>>>>> style="buttontext"><hyperlink target="listInvoiceItems? >>>>>>>>> invoiceId=$ >>>>>>>>> {invoiceId}&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 >>>>>>>>> (" ;locale " ;)).format >>>>>>>>> (org .ofbiz .accounting .invoice >>>>>>>>> .InvoiceWorker >>>>>>>>> .getInvoiceNotApplied(delegator,invoiceId)));}"/> >>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>> (context >>>>>>>>> .get >>>>>>>>> (" ;locale " ;)).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 >>>>>>>>> (" ;locale " ;)).format (org .ofbiz .accounting >>>>>>>>> .invoice >>>>>>>>> .InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)));}"/> >>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>> (context >>>>>>>>> .get >>>>>>>>> (" ;locale " ;)).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 >>>>>>>>> >= 0 >>>>>>>>> && >>>>>>>>> org >>>>>>>>> .ofbiz >>>>>>>>> .accounting.util.UtilAccounting.isCreditAccount(glAccount)) >>>>>>>>> || >>>>>>>>> (postedBalance < 0 && org >>>>>>>>> .ofbiz >>>>>>>>> .accounting.util.UtilAccounting.isDebitAccount(glAccount))}" >>>>>>>>> type="Boolean"/> >>>>>>>>> <set field="absolutePostedBalance" value="${bsh: >>>>>>>>> (postedBalance >= 0? postedBalance: (-1)*postedBalance)}" >>>>>>>>> type="BigDecimal"/> >>>>>>>>> <set field="showTotals" value="${bsh:(isLastRow != null >>>>>>>>> && 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 >>>>>>>>> (" ;locale " ;)).format >>>>>>>>> (org .ofbiz .accounting .invoice >>>>>>>>> .InvoiceWorker >>>>>>>>> .getInvoiceNotApplied(delegator,invoiceId)));}"/> >>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>> (context >>>>>>>>> .get >>>>>>>>> (" ;locale " ;)).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 >>>>>>>>> (" ;locale " ;)).format (org .ofbiz .accounting >>>>>>>>> .invoice >>>>>>>>> .InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)));}"/> >>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>> (context >>>>>>>>> .get >>>>>>>>> (" ;locale " ;)).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 >>>>>>>>> (" ;locale " ;)).format >>>>>>>>> (org .ofbiz .accounting .invoice >>>>>>>>> .InvoiceWorker >>>>>>>>> .getInvoiceNotApplied(delegator,invoiceId)));}"/> >>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>> (context >>>>>>>>> .get >>>>>>>>> (" ;locale " ;)).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 >>>>>>>>> (" ;locale " ;)).format (org .ofbiz .accounting >>>>>>>>> .invoice >>>>>>>>> .InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)));}"/> >>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>> (context >>>>>>>>> .get >>>>>>>>> (" ;locale " ;)).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}"/> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>> >>>>>>> >>>>>> >>>>> >>>> >> |
Type Change Merge (was Re: svn commit: r728176 - in /ofbiz/trunk/applications/acco
|
|
Here is the list of conflicts, just an FYI to avoid redundant effort: C applications/party/webapp/partymgr/WEB-INF/actions/party/ PartyFinancialHistory.groovy C applications/product/script/org/ofbiz/product/product/ ProductServices.xml C applications/product/script/org/ofbiz/product/product/ ProductUomFormulas.xml C applications/product/script/org/ofbiz/product/inventory/ InventoryServices.xml C applications/product/script/org/ofbiz/product/inventory/ InventoryIssueServices.xml C applications/product/script/org/ofbiz/product/inventory/ InventoryReserveServices.xml C applications/product/script/org/ofbiz/product/inventory/ StockMoveServices.xml C applications/product/script/org/ofbiz/product/cost/ CostServices.xml C applications/product/script/org/ofbiz/shipment/picklist/ PicklistServices.xml C applications/product/script/org/ofbiz/shipment/shipment/ ShipmentServices.xml C applications/product/script/org/ofbiz/shipment/issuance/ IssuanceServices.xml C applications/product/src/org/ofbiz/product/test/ InventoryItemTransferTest.java C applications/product/src/org/ofbiz/product/test/ StockMovesTest.java C applications/product/src/org/ofbiz/product/product/ ProductServices.java C applications/product/src/org/ofbiz/product/product/ ProductEvents.java C applications/product/src/org/ofbiz/product/product/ ProductWorker.java C applications/product/src/org/ofbiz/product/price/ PriceServices.java C applications/product/src/org/ofbiz/product/spreadsheetimport/ ImportProductServices.java C applications/product/src/org/ofbiz/product/spreadsheetimport/ ImportProductHelper.java C applications/product/src/org/ofbiz/product/subscription/ SubscriptionServices.java C applications/product/src/org/ofbiz/product/config/ ProductConfigWrapper.java C applications/product/src/org/ofbiz/product/store/ ProductStoreWorker.java C applications/product/src/org/ofbiz/product/inventory/ InventoryServices.java C applications/product/src/org/ofbiz/shipment/shipment/ ShipmentServices.java C applications/product/src/org/ofbiz/shipment/thirdparty/dhl/ DhlServices.java C applications/product/src/org/ofbiz/shipment/thirdparty/ups/ UpsServices.java C applications/product/src/org/ofbiz/shipment/thirdparty/usps/ UspsServices.java C applications/product/src/org/ofbiz/shipment/thirdparty/fedex/ FedexServices.java C applications/product/src/org/ofbiz/shipment/packing/ PackingServices.java C applications/product/src/org/ofbiz/shipment/packing/ PackingSession.java C applications/product/src/org/ofbiz/shipment/packing/ PackingSessionLine.java C applications/manufacturing/script/org/ofbiz/manufacturing/ jobshopmgt/ProductionRunServices.xml C applications/manufacturing/webapp/manufacturing/jobshopmgt/ ProductionRunForms.xml C applications/accounting/widget/ReportFinancialSummaryForms.xml C applications/accounting/script/org/ofbiz/accounting/fixedasset/ FixedAssetServices.xml C applications/accounting/script/org/ofbiz/accounting/ledger/ GeneralLedgerServices.xml C applications/accounting/script/org/ofbiz/accounting/finaccount/ FinAccountServices.xml C applications/accounting/script/org/ofbiz/accounting/olap/ FactServices.xml C applications/accounting/script/org/ofbiz/accounting/invoice/ SampleCommissionServices.xml C applications/accounting/script/org/ofbiz/accounting/payment/ PaymentServices.xml C applications/accounting/src/org/ofbiz/accounting/invoice/ InvoiceWorker.java C applications/accounting/src/org/ofbiz/accounting/payment/ PaymentWorker.java C applications/accounting/webapp/accounting/WEB-INF/actions/ invoice/EditInvoice.groovy C applications/content/script/org/ofbiz/content/content/ ContentServices.xml C applications/order/script/org/ofbiz/order/order/ OrderSimpleMethods.xml C applications/order/script/org/ofbiz/order/order/ OrderReturnServices.xml C applications/order/script/org/ofbiz/order/order/OrderServices.xml C applications/order/script/org/ofbiz/order/quote/QuoteServices.xml C applications/order/src/org/ofbiz/order/shoppingcart/shipping/ ShippingEvents.java C applications/order/src/org/ofbiz/order/shoppingcart/ ShoppingCartServices.java C applications/order/src/org/ofbiz/order/shoppingcart/ ShoppingCartEvents.java C applications/order/src/org/ofbiz/order/order/OrderReadHelper.java C framework/base/src/org/ofbiz/base/util/UtilParse.java C framework/base/src/org/ofbiz/base/util/string/ FlexibleStringExpander.java I have a bit of time today so I'll see if I can work through them... -David On Jan 5, 2009, at 11:47 AM, David E Jones wrote: > > The approach I was taking was a bit different (I think). I was > starting at the data model and looking at the fields that made more > sense as a fixed-point instead of a floating point, then changing > that in the data model and working up from there with services and > so on. > > I'll play with the merge today and see how it looks. If it's not too > much work I may just go for it, and then like Jacques mentioned he > and others can get involved more easily. Before doing the merge I'll > make sure at least the basics of order placement and fulfillment and > such and all of the various things they trigger and get going. > > -David > > > On Jan 4, 2009, at 6:28 PM, Scott Gray wrote: > >> Hi David, >> To be honest I have no idea what I would have worked on next, I >> generally >> just run a search for the word "double" and then start plugging away. >> >> I think it would be fine to merge back into the trunk but I have to >> admit I >> haven't spent much time testing that everything is working ok. I >> got half >> way through fixing the unit tests in the trunk yesterday and was >> planning to >> finish that this week and then merge it into the clean up branch so >> I could >> run a few tests on the work so far. I would definitely prefer to >> have >> everything in the trunk, but I can't say how smoothly everything >> will run >> other than I *think* it will be ok. >> >> The issue would be is anyone willing to do the merge? I'm guessing >> it will >> be relatively time consuming considering that it's been about 4 >> months since >> the branch was created. I'm happy to take care of it but once >> again I won't >> have time during the next couple of weeks. >> >> Regards >> Scott >> >> 2009/1/5 David E Jones <[hidden email]> >> >>> >>> Scott, >>> >>> What is next on your list... or if you had more time what would >>> you work on >>> next? >>> >>> I ask because I'm wondering if it is far enough a long to just >>> merge back >>> into the trunk and continue work from there? If most stuff is >>> working and >>> there aren't too many warnings in the logs, it might be well worth >>> getting >>> out to everyone to help refine it and find anything smaller that >>> might be >>> missing. >>> >>> -David >>> >>> >>> >>> On Jan 4, 2009, at 3:59 PM, Scott Gray wrote: >>> >>> 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 <[hidden email]> >>>> >>>> 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" <[hidden email]> >>>>> >>>>> Hi Scott, >>>>>> >>>>>> I checked out and will have a look >>>>>> >>>>>> Thanks >>>>>> >>>>>> Jacques >>>>>> >>>>>> From: "Scott Gray" <[hidden email]> >>>>>> >>>>>> 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 <[hidden email]> >>>>>>> >>>>>>> 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" <[hidden email]> >>>>>>>> >>>>>>>> >>>>>>>> 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, [hidden email] 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 >>>>>>>>>> (" ;locale " ;)).format (org .ofbiz >>>>>>>>>> .accounting >>>>>>>>>> .invoice.InvoiceWorker.getInvoiceTotalBd(invoice)));}"/> >>>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>>> (context >>>>>>>>>> .get >>>>>>>>>> (" ;locale " ;)).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("locale")).format(quantity*amount));}"/> >>>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>>> (context.get("locale")).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("locale")).format(quantity*amount));}"/> >>>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>>> (context.get("locale")).format(quantity*amount));}" >>>>>>>>>> type="BigDecimal"/> >>>>>>>>>> </row-actions> >>>>>>>>>> <field name="invoiceId"><hidden/></field> >>>>>>>>>> <field name="invoiceItemSeqId" widget- >>>>>>>>>> style="buttontext"><hyperlink target="listInvoiceItems? >>>>>>>>>> invoiceId=$ >>>>>>>>>> {invoiceId}&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 >>>>>>>>>> (" ;locale " ;)).format >>>>>>>>>> (org .ofbiz .accounting .invoice >>>>>>>>>> .InvoiceWorker >>>>>>>>>> .getInvoiceNotApplied(delegator,invoiceId)));}"/> >>>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>>> (context >>>>>>>>>> .get >>>>>>>>>> (" ;locale " ;)).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 >>>>>>>>>> (" ;locale " ;)).format (org .ofbiz .accounting >>>>>>>>>> .invoice >>>>>>>>>> .InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)));}"/> >>>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>>> (context >>>>>>>>>> .get >>>>>>>>>> (" ;locale " ;)).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 >>>>>>>>>> >= 0 >>>>>>>>>> && >>>>>>>>>> org >>>>>>>>>> .ofbiz >>>>>>>>>> .accounting.util.UtilAccounting.isCreditAccount(glAccount)) >>>>>>>>>> || >>>>>>>>>> (postedBalance < 0 && org >>>>>>>>>> .ofbiz >>>>>>>>>> .accounting.util.UtilAccounting.isDebitAccount(glAccount))}" >>>>>>>>>> type="Boolean"/> >>>>>>>>>> <set field="absolutePostedBalance" value="${bsh: >>>>>>>>>> (postedBalance >= 0? postedBalance: (-1)*postedBalance)}" >>>>>>>>>> type="BigDecimal"/> >>>>>>>>>> <set field="showTotals" value="${bsh:(isLastRow != null >>>>>>>>>> && 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 >>>>>>>>>> (" ;locale " ;)).format >>>>>>>>>> (org .ofbiz .accounting .invoice >>>>>>>>>> .InvoiceWorker >>>>>>>>>> .getInvoiceNotApplied(delegator,invoiceId)));}"/> >>>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>>> (context >>>>>>>>>> .get >>>>>>>>>> (" ;locale " ;)).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 >>>>>>>>>> (" ;locale " ;)).format (org .ofbiz .accounting >>>>>>>>>> .invoice >>>>>>>>>> .InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)));}"/> >>>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>>> (context >>>>>>>>>> .get >>>>>>>>>> (" ;locale " ;)).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 >>>>>>>>>> (" ;locale " ;)).format >>>>>>>>>> (org .ofbiz .accounting .invoice >>>>>>>>>> .InvoiceWorker >>>>>>>>>> .getInvoiceNotApplied(delegator,invoiceId)));}"/> >>>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>>> (context >>>>>>>>>> .get >>>>>>>>>> (" ;locale " ;)).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 >>>>>>>>>> (" ;locale " ;)).format (org .ofbiz .accounting >>>>>>>>>> .invoice >>>>>>>>>> .InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)));}"/> >>>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>>> (context >>>>>>>>>> .get >>>>>>>>>> (" ;locale " ;)).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}"/> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>> >>>>>>>> >>>>>>> >>>>>> >>>>> >>> > |
Re: Type Change Merge (was Re: svn commit: r728176 - in /ofbiz/trunk/applications/acco
|
|
The branch is merged, with all conflicts resolved, in SVN rev 731851. It is based on rev 731346 of the typecheckcleanup200810 branch, which IMO we should abandon now. If no one disagrees I'll delete it in the near future. It is great that we have a lot of refactoring and cleanups going on right now (especially the simple-method cleanups and the Java 5 type improvements), but that definitely made this merge a great deal more... well... full of busy work. ;) There is still more work to do. In general there aren't many fields in OFBiz that should be floating point (double) numbers, especially since so many numbers have to do with money or quantities or the like, so over time we'll probably eliminate most (but not all!) double fields and code. For most systems the update should be smooth, but you'll notice in some of the fieldtype*.xml files that db types have changed from floating to fixed point (ie things like DOUBLE to NUMERIC(18,6)). This shouldn't cause problems, not even on production systems, but could lead to a loss of precision in some cases (probably no worse than what happened before but not as clean). Anyway, if anyone notices any issues, especially errors related to Double or BigDecimal, then please report them right away as they may be related to this issue. -David On Jan 5, 2009, at 2:31 PM, David E Jones wrote: > > Here is the list of conflicts, just an FYI to avoid redundant effort: > > C applications/party/webapp/partymgr/WEB-INF/actions/party/ > PartyFinancialHistory.groovy > C applications/product/script/org/ofbiz/product/product/ > ProductServices.xml > C applications/product/script/org/ofbiz/product/product/ > ProductUomFormulas.xml > C applications/product/script/org/ofbiz/product/inventory/ > InventoryServices.xml > C applications/product/script/org/ofbiz/product/inventory/ > InventoryIssueServices.xml > C applications/product/script/org/ofbiz/product/inventory/ > InventoryReserveServices.xml > C applications/product/script/org/ofbiz/product/inventory/ > StockMoveServices.xml > C applications/product/script/org/ofbiz/product/cost/ > CostServices.xml > C applications/product/script/org/ofbiz/shipment/picklist/ > PicklistServices.xml > C applications/product/script/org/ofbiz/shipment/shipment/ > ShipmentServices.xml > C applications/product/script/org/ofbiz/shipment/issuance/ > IssuanceServices.xml > C applications/product/src/org/ofbiz/product/test/ > InventoryItemTransferTest.java > C applications/product/src/org/ofbiz/product/test/ > StockMovesTest.java > C applications/product/src/org/ofbiz/product/product/ > ProductServices.java > C applications/product/src/org/ofbiz/product/product/ > ProductEvents.java > C applications/product/src/org/ofbiz/product/product/ > ProductWorker.java > C applications/product/src/org/ofbiz/product/price/ > PriceServices.java > C applications/product/src/org/ofbiz/product/spreadsheetimport/ > ImportProductServices.java > C applications/product/src/org/ofbiz/product/spreadsheetimport/ > ImportProductHelper.java > C applications/product/src/org/ofbiz/product/subscription/ > SubscriptionServices.java > C applications/product/src/org/ofbiz/product/config/ > ProductConfigWrapper.java > C applications/product/src/org/ofbiz/product/store/ > ProductStoreWorker.java > C applications/product/src/org/ofbiz/product/inventory/ > InventoryServices.java > C applications/product/src/org/ofbiz/shipment/shipment/ > ShipmentServices.java > C applications/product/src/org/ofbiz/shipment/thirdparty/dhl/ > DhlServices.java > C applications/product/src/org/ofbiz/shipment/thirdparty/ups/ > UpsServices.java > C applications/product/src/org/ofbiz/shipment/thirdparty/usps/ > UspsServices.java > C applications/product/src/org/ofbiz/shipment/thirdparty/fedex/ > FedexServices.java > C applications/product/src/org/ofbiz/shipment/packing/ > PackingServices.java > C applications/product/src/org/ofbiz/shipment/packing/ > PackingSession.java > C applications/product/src/org/ofbiz/shipment/packing/ > PackingSessionLine.java > C applications/manufacturing/script/org/ofbiz/manufacturing/ > jobshopmgt/ProductionRunServices.xml > C applications/manufacturing/webapp/manufacturing/jobshopmgt/ > ProductionRunForms.xml > C applications/accounting/widget/ReportFinancialSummaryForms.xml > C applications/accounting/script/org/ofbiz/accounting/ > fixedasset/FixedAssetServices.xml > C applications/accounting/script/org/ofbiz/accounting/ledger/ > GeneralLedgerServices.xml > C applications/accounting/script/org/ofbiz/accounting/ > finaccount/FinAccountServices.xml > C applications/accounting/script/org/ofbiz/accounting/olap/ > FactServices.xml > C applications/accounting/script/org/ofbiz/accounting/invoice/ > SampleCommissionServices.xml > C applications/accounting/script/org/ofbiz/accounting/payment/ > PaymentServices.xml > C applications/accounting/src/org/ofbiz/accounting/invoice/ > InvoiceWorker.java > C applications/accounting/src/org/ofbiz/accounting/payment/ > PaymentWorker.java > C applications/accounting/webapp/accounting/WEB-INF/actions/ > invoice/EditInvoice.groovy > C applications/content/script/org/ofbiz/content/content/ > ContentServices.xml > C applications/order/script/org/ofbiz/order/order/ > OrderSimpleMethods.xml > C applications/order/script/org/ofbiz/order/order/ > OrderReturnServices.xml > C applications/order/script/org/ofbiz/order/order/ > OrderServices.xml > C applications/order/script/org/ofbiz/order/quote/ > QuoteServices.xml > C applications/order/src/org/ofbiz/order/shoppingcart/shipping/ > ShippingEvents.java > C applications/order/src/org/ofbiz/order/shoppingcart/ > ShoppingCartServices.java > C applications/order/src/org/ofbiz/order/shoppingcart/ > ShoppingCartEvents.java > C applications/order/src/org/ofbiz/order/order/ > OrderReadHelper.java > C framework/base/src/org/ofbiz/base/util/UtilParse.java > C framework/base/src/org/ofbiz/base/util/string/ > FlexibleStringExpander.java > > I have a bit of time today so I'll see if I can work through them... > > -David > > > > On Jan 5, 2009, at 11:47 AM, David E Jones wrote: > >> >> The approach I was taking was a bit different (I think). I was >> starting at the data model and looking at the fields that made more >> sense as a fixed-point instead of a floating point, then changing >> that in the data model and working up from there with services and >> so on. >> >> I'll play with the merge today and see how it looks. If it's not >> too much work I may just go for it, and then like Jacques mentioned >> he and others can get involved more easily. Before doing the merge >> I'll make sure at least the basics of order placement and >> fulfillment and such and all of the various things they trigger and >> get going. >> >> -David >> >> >> On Jan 4, 2009, at 6:28 PM, Scott Gray wrote: >> >>> Hi David, >>> To be honest I have no idea what I would have worked on next, I >>> generally >>> just run a search for the word "double" and then start plugging >>> away. >>> >>> I think it would be fine to merge back into the trunk but I have >>> to admit I >>> haven't spent much time testing that everything is working ok. I >>> got half >>> way through fixing the unit tests in the trunk yesterday and was >>> planning to >>> finish that this week and then merge it into the clean up branch >>> so I could >>> run a few tests on the work so far. I would definitely prefer to >>> have >>> everything in the trunk, but I can't say how smoothly everything >>> will run >>> other than I *think* it will be ok. >>> >>> The issue would be is anyone willing to do the merge? I'm >>> guessing it will >>> be relatively time consuming considering that it's been about 4 >>> months since >>> the branch was created. I'm happy to take care of it but once >>> again I won't >>> have time during the next couple of weeks. >>> >>> Regards >>> Scott >>> >>> 2009/1/5 David E Jones <[hidden email]> >>> >>>> >>>> Scott, >>>> >>>> What is next on your list... or if you had more time what would >>>> you work on >>>> next? >>>> >>>> I ask because I'm wondering if it is far enough a long to just >>>> merge back >>>> into the trunk and continue work from there? If most stuff is >>>> working and >>>> there aren't too many warnings in the logs, it might be well >>>> worth getting >>>> out to everyone to help refine it and find anything smaller that >>>> might be >>>> missing. >>>> >>>> -David >>>> >>>> >>>> >>>> On Jan 4, 2009, at 3:59 PM, Scott Gray wrote: >>>> >>>> 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 <[hidden email]> >>>>> >>>>> 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" <[hidden email]> >>>>>> >>>>>> Hi Scott, >>>>>>> >>>>>>> I checked out and will have a look >>>>>>> >>>>>>> Thanks >>>>>>> >>>>>>> Jacques >>>>>>> >>>>>>> From: "Scott Gray" <[hidden email]> >>>>>>> >>>>>>> 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 <[hidden email]> >>>>>>>> >>>>>>>> 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" <[hidden email]> >>>>>>>>> >>>>>>>>> >>>>>>>>> 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, [hidden email] 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 >>>>>>>>>>> (" ;locale " ;)).format (org .ofbiz >>>>>>>>>>> .accounting >>>>>>>>>>> .invoice.InvoiceWorker.getInvoiceTotalBd(invoice)));}"/> >>>>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>>>> (context >>>>>>>>>>> .get >>>>>>>>>>> (" ;locale " ;)).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("locale")).format(quantity*amount));}"/> >>>>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>>>> (context >>>>>>>>>>> .get("locale")).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("locale")).format(quantity*amount));}"/> >>>>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>>>> (context >>>>>>>>>>> .get("locale")).format(quantity*amount));}" >>>>>>>>>>> type="BigDecimal"/> >>>>>>>>>>> </row-actions> >>>>>>>>>>> <field name="invoiceId"><hidden/></field> >>>>>>>>>>> <field name="invoiceItemSeqId" widget- >>>>>>>>>>> style="buttontext"><hyperlink target="listInvoiceItems? >>>>>>>>>>> invoiceId=$ >>>>>>>>>>> {invoiceId}&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 >>>>>>>>>>> (" ;locale " ;)).format >>>>>>>>>>> (org .ofbiz .accounting .invoice >>>>>>>>>>> .InvoiceWorker >>>>>>>>>>> .getInvoiceNotApplied(delegator,invoiceId)));}"/> >>>>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>>>> (context >>>>>>>>>>> .get >>>>>>>>>>> (" ;locale " ;)).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 >>>>>>>>>>> (" ;locale " ;)).format (org .ofbiz .accounting >>>>>>>>>>> .invoice >>>>>>>>>>> .InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)));}"/> >>>>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>>>> (context >>>>>>>>>>> .get >>>>>>>>>>> (" ;locale " ;)).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 >>>>>>>>>>> >= 0 >>>>>>>>>>> && >>>>>>>>>>> org >>>>>>>>>>> .ofbiz >>>>>>>>>>> .accounting.util.UtilAccounting.isCreditAccount(glAccount)) >>>>>>>>>>> || >>>>>>>>>>> (postedBalance < 0 && org >>>>>>>>>>> .ofbiz >>>>>>>>>>> .accounting.util.UtilAccounting.isDebitAccount(glAccount))}" >>>>>>>>>>> type="Boolean"/> >>>>>>>>>>> <set field="absolutePostedBalance" value="${bsh: >>>>>>>>>>> (postedBalance >= 0? postedBalance: (-1)*postedBalance)}" >>>>>>>>>>> type="BigDecimal"/> >>>>>>>>>>> <set field="showTotals" value="${bsh:(isLastRow != null >>>>>>>>>>> && 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 >>>>>>>>>>> (" ;locale " ;)).format >>>>>>>>>>> (org .ofbiz .accounting .invoice >>>>>>>>>>> .InvoiceWorker >>>>>>>>>>> .getInvoiceNotApplied(delegator,invoiceId)));}"/> >>>>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>>>> (context >>>>>>>>>>> .get >>>>>>>>>>> (" ;locale " ;)).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 >>>>>>>>>>> (" ;locale " ;)).format (org .ofbiz .accounting >>>>>>>>>>> .invoice >>>>>>>>>>> .InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)));}"/> >>>>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>>>> (context >>>>>>>>>>> .get >>>>>>>>>>> (" ;locale " ;)).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 >>>>>>>>>>> (" ;locale " ;)).format >>>>>>>>>>> (org .ofbiz .accounting .invoice >>>>>>>>>>> .InvoiceWorker >>>>>>>>>>> .getInvoiceNotApplied(delegator,invoiceId)));}"/> >>>>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>>>> (context >>>>>>>>>>> .get >>>>>>>>>>> (" ;locale " ;)).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 >>>>>>>>>>> (" ;locale " ;)).format (org .ofbiz .accounting >>>>>>>>>>> .invoice >>>>>>>>>>> .InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)));}"/> >>>>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>>>> (context >>>>>>>>>>> .get >>>>>>>>>>> (" ;locale " ;)).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}"/> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>> >>>>>>>>> >>>>>>>> >>>>>>> >>>>>> >>>> >> > |
Re: Type Change Merge (was Re: svn commit: r728176 - in /ofbiz/trunk/applications/acco
|
|
Thanks David!
and +1 for discarding the branch Regards Scott 2009/1/6 David E Jones <[hidden email]> > > The branch is merged, with all conflicts resolved, in SVN rev 731851. It is > based on rev 731346 of the typecheckcleanup200810 branch, which IMO we > should abandon now. If no one disagrees I'll delete it in the near future. > > It is great that we have a lot of refactoring and cleanups going on right > now (especially the simple-method cleanups and the Java 5 type > improvements), but that definitely made this merge a great deal more... > well... full of busy work. ;) > > There is still more work to do. In general there aren't many fields in > OFBiz that should be floating point (double) numbers, especially since so > many numbers have to do with money or quantities or the like, so over time > we'll probably eliminate most (but not all!) double fields and code. > > For most systems the update should be smooth, but you'll notice in some of > the fieldtype*.xml files that db types have changed from floating to fixed > point (ie things like DOUBLE to NUMERIC(18,6)). This shouldn't cause > problems, not even on production systems, but could lead to a loss of > precision in some cases (probably no worse than what happened before but not > as clean). > > Anyway, if anyone notices any issues, especially errors related to Double > or BigDecimal, then please report them right away as they may be related to > this issue. > > -David > > > > On Jan 5, 2009, at 2:31 PM, David E Jones wrote: > > >> Here is the list of conflicts, just an FYI to avoid redundant effort: >> >> C >> applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy >> C >> applications/product/script/org/ofbiz/product/product/ProductServices.xml >> C >> applications/product/script/org/ofbiz/product/product/ProductUomFormulas.xml >> C >> applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml >> C >> applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml >> C >> applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml >> C >> applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml >> C applications/product/script/org/ofbiz/product/cost/CostServices.xml >> C >> applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml >> C >> applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml >> C >> applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml >> C >> applications/product/src/org/ofbiz/product/test/InventoryItemTransferTest.java >> C applications/product/src/org/ofbiz/product/test/StockMovesTest.java >> C >> applications/product/src/org/ofbiz/product/product/ProductServices.java >> C >> applications/product/src/org/ofbiz/product/product/ProductEvents.java >> C >> applications/product/src/org/ofbiz/product/product/ProductWorker.java >> C applications/product/src/org/ofbiz/product/price/PriceServices.java >> C >> applications/product/src/org/ofbiz/product/spreadsheetimport/ImportProductServices.java >> C >> applications/product/src/org/ofbiz/product/spreadsheetimport/ImportProductHelper.java >> C >> applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java >> C >> applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java >> C >> applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java >> C >> applications/product/src/org/ofbiz/product/inventory/InventoryServices.java >> C >> applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java >> C >> applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java >> C >> applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java >> C >> applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java >> C >> applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java >> C >> applications/product/src/org/ofbiz/shipment/packing/PackingServices.java >> C >> applications/product/src/org/ofbiz/shipment/packing/PackingSession.java >> C >> applications/product/src/org/ofbiz/shipment/packing/PackingSessionLine.java >> C >> applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml >> C >> applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml >> C applications/accounting/widget/ReportFinancialSummaryForms.xml >> C >> applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml >> C >> applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml >> C >> applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml >> C >> applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml >> C >> applications/accounting/script/org/ofbiz/accounting/invoice/SampleCommissionServices.xml >> C >> applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml >> C >> applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java >> C >> applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java >> C >> applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy >> C >> applications/content/script/org/ofbiz/content/content/ContentServices.xml >> C >> applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml >> C >> applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml >> C applications/order/script/org/ofbiz/order/order/OrderServices.xml >> C applications/order/script/org/ofbiz/order/quote/QuoteServices.xml >> C >> applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java >> C >> applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java >> C >> applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java >> C applications/order/src/org/ofbiz/order/order/OrderReadHelper.java >> C framework/base/src/org/ofbiz/base/util/UtilParse.java >> C >> framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java >> >> I have a bit of time today so I'll see if I can work through them... >> >> -David >> >> >> >> On Jan 5, 2009, at 11:47 AM, David E Jones wrote: >> >> >>> The approach I was taking was a bit different (I think). I was starting >>> at the data model and looking at the fields that made more sense as a >>> fixed-point instead of a floating point, then changing that in the data >>> model and working up from there with services and so on. >>> >>> I'll play with the merge today and see how it looks. If it's not too much >>> work I may just go for it, and then like Jacques mentioned he and others can >>> get involved more easily. Before doing the merge I'll make sure at least the >>> basics of order placement and fulfillment and such and all of the various >>> things they trigger and get going. >>> >>> -David >>> >>> >>> On Jan 4, 2009, at 6:28 PM, Scott Gray wrote: >>> >>> Hi David, >>>> To be honest I have no idea what I would have worked on next, I >>>> generally >>>> just run a search for the word "double" and then start plugging away. >>>> >>>> I think it would be fine to merge back into the trunk but I have to >>>> admit I >>>> haven't spent much time testing that everything is working ok. I got >>>> half >>>> way through fixing the unit tests in the trunk yesterday and was >>>> planning to >>>> finish that this week and then merge it into the clean up branch so I >>>> could >>>> run a few tests on the work so far. I would definitely prefer to have >>>> everything in the trunk, but I can't say how smoothly everything will >>>> run >>>> other than I *think* it will be ok. >>>> >>>> The issue would be is anyone willing to do the merge? I'm guessing it >>>> will >>>> be relatively time consuming considering that it's been about 4 months >>>> since >>>> the branch was created. I'm happy to take care of it but once again I >>>> won't >>>> have time during the next couple of weeks. >>>> >>>> Regards >>>> Scott >>>> >>>> 2009/1/5 David E Jones <[hidden email]> >>>> >>>> >>>>> Scott, >>>>> >>>>> What is next on your list... or if you had more time what would you >>>>> work on >>>>> next? >>>>> >>>>> I ask because I'm wondering if it is far enough a long to just merge >>>>> back >>>>> into the trunk and continue work from there? If most stuff is working >>>>> and >>>>> there aren't too many warnings in the logs, it might be well worth >>>>> getting >>>>> out to everyone to help refine it and find anything smaller that might >>>>> be >>>>> missing. >>>>> >>>>> -David >>>>> >>>>> >>>>> >>>>> On Jan 4, 2009, at 3:59 PM, Scott Gray wrote: >>>>> >>>>> 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 <[hidden email]> >>>>>> >>>>>> 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" <[hidden email]> >>>>>>> >>>>>>> Hi Scott, >>>>>>> >>>>>>>> >>>>>>>> I checked out and will have a look >>>>>>>> >>>>>>>> Thanks >>>>>>>> >>>>>>>> Jacques >>>>>>>> >>>>>>>> From: "Scott Gray" <[hidden email]> >>>>>>>> >>>>>>>> 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 <[hidden email]> >>>>>>>>> >>>>>>>>> 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" <[hidden email]> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> 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, [hidden email] 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 >>>>>>>>>>>> (" ;locale " ;)).format (org .ofbiz >>>>>>>>>>>> >>>>>>>>>>>> .accounting.invoice.InvoiceWorker.getInvoiceTotalBd(invoice)));}"/> >>>>>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>>>>> (context >>>>>>>>>>>> .get >>>>>>>>>>>> (" ;locale " ;)).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("locale")).format(quantity*amount));}"/> >>>>>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>>>>> (context.get("locale")).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("locale")).format(quantity*amount));}"/> >>>>>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>>>>> (context.get("locale")).format(quantity*amount));}" >>>>>>>>>>>> type="BigDecimal"/> >>>>>>>>>>>> </row-actions> >>>>>>>>>>>> <field name="invoiceId"><hidden/></field> >>>>>>>>>>>> <field name="invoiceItemSeqId" widget- >>>>>>>>>>>> style="buttontext"><hyperlink >>>>>>>>>>>> target="listInvoiceItems?invoiceId=$ >>>>>>>>>>>> {invoiceId}&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 >>>>>>>>>>>> (" ;locale " ;)).format (org .ofbiz .accounting .invoice >>>>>>>>>>>> .InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/> >>>>>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>>>>> (context >>>>>>>>>>>> .get >>>>>>>>>>>> (" ;locale " ;)).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 >>>>>>>>>>>> (" ;locale " ;)).format (org .ofbiz .accounting >>>>>>>>>>>> >>>>>>>>>>>> .invoice.InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)));}"/> >>>>>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>>>>> (context >>>>>>>>>>>> .get >>>>>>>>>>>> (" ;locale " ;)).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 >= 0 >>>>>>>>>>>> && >>>>>>>>>>>> >>>>>>>>>>>> org.ofbiz.accounting.util.UtilAccounting.isCreditAccount(glAccount)) >>>>>>>>>>>> || >>>>>>>>>>>> (postedBalance < 0 && org >>>>>>>>>>>> >>>>>>>>>>>> .ofbiz.accounting.util.UtilAccounting.isDebitAccount(glAccount))}" >>>>>>>>>>>> type="Boolean"/> >>>>>>>>>>>> <set field="absolutePostedBalance" value="${bsh: >>>>>>>>>>>> (postedBalance >= 0? postedBalance: (-1)*postedBalance)}" >>>>>>>>>>>> type="BigDecimal"/> >>>>>>>>>>>> <set field="showTotals" value="${bsh:(isLastRow != null >>>>>>>>>>>> && 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 >>>>>>>>>>>> (" ;locale " ;)).format (org .ofbiz .accounting .invoice >>>>>>>>>>>> .InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/> >>>>>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>>>>> (context >>>>>>>>>>>> .get >>>>>>>>>>>> (" ;locale " ;)).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 >>>>>>>>>>>> (" ;locale " ;)).format (org .ofbiz .accounting >>>>>>>>>>>> >>>>>>>>>>>> .invoice.InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)));}"/> >>>>>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>>>>> (context >>>>>>>>>>>> .get >>>>>>>>>>>> (" ;locale " ;)).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 >>>>>>>>>>>> (" ;locale " ;)).format (org .ofbiz .accounting .invoice >>>>>>>>>>>> .InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/> >>>>>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>>>>> (context >>>>>>>>>>>> .get >>>>>>>>>>>> (" ;locale " ;)).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 >>>>>>>>>>>> (" ;locale " ;)).format (org .ofbiz .accounting >>>>>>>>>>>> >>>>>>>>>>>> .invoice.InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)));}"/> >>>>>>>>>>>> + return (NumberFormat .getNumberInstance >>>>>>>>>>>> (context >>>>>>>>>>>> .get >>>>>>>>>>>> (" ;locale " ;)).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}"/> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>> >>>>>>>>> >>>>>>>> >>>>>>> >>>>> >>> >> > |
«
Return to OFBiz - Dev
|
1 view|%1 views
| Free forum by Nabble | Edit this page |