Re: svn commit: r692339 - in /ofbiz/trunk/specialpurpose/mypage: webapp/mypage/WEB-INF/actions/ConvertInvoiceCurrency.groovy widget/MyPageScreens.xml

[Jacopo Cappellato]

Hi Hans,




Cheers,

Jacopo


On Sep 5, 2008, at 11:11 AM, [EMAIL PROTECTED] wrote:

just out of curiosity: is it legal/allowed to distribute the same invoice in different currencies?

Author: hansbak
Date: Thu Sep  4 22:41:52 2008
New Revision: 692339

URL: http://svn.apache.org/viewvc?rev=692339&view=rev
Log:
show invoice in foreign currency properly

Modified:

   ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml


URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/actions/ConvertInvoiceCurrency.groovy?rev=692339&r1=692338&r2=692339&view=diff

@@ -38,7 +38,8 @@
  } else {

  }

+  // check if conversion required

    result = dispatcher.runSync("convertUom", [uomId : currencyUomId,

@@ -49,4 +50,7 @@

        context.currencyUomId = otherCurrency;
    }
+  } else {

  }

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml?rev=692339&r1=692338&r2=692339&view=diff

@@ -468,12 +468,13 @@
                    <condition-list combine="and">

                        <condition-list combine="or">

                        </condition-list>
                    </condition-list>
+                    <order-by field-name="invoiceDate DESC"/>
                </entity-condition>
            </actions>
            <widgets>

ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/actions/ ConvertInvoiceCurrency.groovy Modified: ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/ actions/ConvertInvoiceCurrency.groovy = = = = = = = = ====================================================================== --- ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/actions/ ConvertInvoiceCurrency.groovy (original) +++ ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/actions/ ConvertInvoiceCurrency.groovy Thu Sep 4 22:41:52 2008 otherCurrency = delegator.findByPrimaryKey("Party", ["partyId" : fromPartyId]).preferredCurrencyUomId; - if (otherCurrency && currencyUomId && ! otherCurrency.equals(currencyUomId)) { + if (currencyUomId && otherCurrency != currencyUomId && ! otherCurrency.equals(currencyUomId)) { uomIdTo : otherCurrency, originalValue : new Double("1.00"), context.amountToApply = org .ofbiz .accounting .invoice .InvoiceWorker .getInvoiceNotApplied(delegator,invoiceId).multiply(new BigDecimal(result.convertedValue.toString())).setScale(decimals, rounding); + context.total = (org .ofbiz .accounting .invoice.InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)); + context.amountToApply = org .ofbiz .accounting .invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId); = = = = = = = = ====================================================================== --- ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml (original) +++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml Thu Sep 4 22:41:52 2008 <condition-expr field-name="partyId" operator="equals" env-name="myCompanyId"/> - <condition-expr field-name="statusId" operator="equals" value="APPROVED"/> - <condition-expr field-name="statusId" operator="equals" value="SEND"/> - <condition-expr field-name="statusId" operator="equals" value="READY"/> - <condition-expr field-name="statusId" operator="equals" value="PAID"/> + <condition-expr field-name="statusId" operator="equals" value="INVOICE_APPROVED"/> + <condition-expr field-name="statusId" operator="equals" value="INVOICE_SEND"/> + <condition-expr field-name="statusId" operator="equals" value="INVOICE_READY"/> + <condition-expr field-name="statusId" operator="equals" value="INVOICE_PAID"/>

smime.p7s
Description: S/MIME cryptographic signature