Author: hansbak
Date: Thu Nov 12 02:57:05 2009
New Revision: 835204
URL: http://svn.apache.org/viewvc?rev=835204&view=rev
Log:
allow 'safe' html in invoice description and message
Modified:
ofbiz/trunk/applications/accounting/servicedef/services_invoice.xml
ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml
Modified: ofbiz/trunk/applications/accounting/servicedef/services_invoice.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_invoice.xml?rev=835204&r1=835203&r2=835204&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/services_invoice.xml
(original)
+++ ofbiz/trunk/applications/accounting/servicedef/services_invoice.xml Thu Nov
12 02:57:05 2009
@@ -43,6 +43,8 @@
<override name="statusId" mode = "IN" optional="false"/>
<override name="partyIdFrom" mode = "IN" optional="false"/>
<override name="partyId" mode = "IN" optional="false"/>
+ <override name="description" allow-html="safe"/>
+ <override name="invoiceMessage" allow-html="safe"/>
</service>
<service name="copyInvoice" engine="simple" default-entity-name="Invoice"
location="component://accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml"
invoke="copyInvoice">
@@ -65,6 +67,8 @@
<permission-service service-name="acctgInvoicePermissionCheck"
main-action="UPDATE"/>
<auto-attributes mode="IN" include="pk" optional="false"/>
<auto-attributes mode="IN" include="nonpk" optional="true"/>
+ <override name="description" allow-html="safe"/>
+ <override name="invoiceMessage" allow-html="safe"/>
</service>
<service name="setInvoiceStatus" engine="simple"
location="component://accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml"
invoke="setInvoiceStatus">
@@ -90,7 +94,7 @@
null taxableFlag is considered to be "N" when it should be "unknown". At
some point we'll have to implement the adjustment.includeInTax
field properly so we don't have to rely on Product.taxable and checking by
hand each type that is not taxable. The old way is already
creating an issue with return-wide adjustments: How do we know that such
an adjustment is to be taxed or not? Because of this problem,
- we will continue to have null taxableFlags for awhile yet, which is why
the mantadory taxableFlag of this method was taken out.
+ we will continue to have null taxableFlags for awhile yet, which is why
the mandatory taxableFlag of this method was taken out.
-->
<service name="createInvoiceItem" engine="simple"
default-entity-name="InvoiceItem"
location="component://accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml"
invoke="createInvoiceItem">
Modified: ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml?rev=835204&r1=835203&r2=835204&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml Thu Nov 12
02:57:05 2009
@@ -83,7 +83,7 @@
<field name="invoiceTypeId" sort-field="true"><display-entity
entity-name="InvoiceType"/></field>
<field name="invoiceDate" sort-field="true"><display
type="date"/></field>
<field name="statusId" title="${uiLabelMap.CommonStatus}"
sort-field="true"><display-entity entity-name="StatusItem"/></field>
- <field name="description" sort-field="true"><display/></field>
+ <field name="description" sort-field="true"
encode-output="false"><display/></field>
<field name="partyIdFrom" title="${uiLabelMap.AccountingFromParty}"
sort-field="true">
<hyperlink target="/partymgr/control/PartyFinancialHistory"
target-type="inter-app" description="${partyNameResultFrom.fullName}
[${partyIdFrom}]">
<parameter param-name="partyId" from-field="partyIdFrom"/>
@@ -118,8 +118,8 @@
<field name="invoiceId"><hidden/></field>
<field position="1" name="invoiceTypeId"><display-entity
entity-name="InvoiceType"/></field>
<field name="statusId" title="${uiLabelMap.CommonStatus}"
position="2"><display-entity entity-name="StatusItem"/></field>
- <field position="1" name="description"><display/></field>
- <field position="2" name="invoiceMessage"><display/></field>
+ <field position="1" name="description"
encode-output="false"><display/></field>
+ <field position="2" name="invoiceMessage"
encode-output="false"><display/></field>
<field position="1" name="partyIdFrom">
<hyperlink target="/partymgr/control/viewprofile"
target-type="inter-app" description="${partyNameResultFrom.fullName}
[${invoice.partyIdFrom}]">
<parameter param-name="partyId"
from-field="invoice.partyIdFrom"/>
@@ -198,7 +198,7 @@
target="updatePaymentApplication" title="Apply payments to invoices"
separate-columns="false">
<field name="invoiceItemSeqId"><display/></field>
<field name="productId"><display/></field>
- <field name="description"><display/></field>
+ <field name="description" encode-output="false"><display/></field>
<field name="total" widget-area-style="align-text"><display
type="currency" currency="${invoice.currencyUomId}"/></field>
<field name="invoiceId"><hidden/></field>
<field name="paymentId" widget-style="linktext">
@@ -303,7 +303,7 @@
</field>
<field name="statusId" title="${uiLabelMap.CommonStatus}"
use-when="invoice==null"><hidden value="INVOICE_IN_PROCESS"/></field>
<field name="statusId" title="${uiLabelMap.CommonStatus}" position="2"
use-when="invoice!=null"><display-entity entity-name="StatusItem"/></field>
- <field position="1" name="description"><text size="100"/></field>
+ <field position="1" name="description" encode-output="false"><text
size="100"/></field>
<field position="1" name="partyIdFrom"
use-when="invoiceType.getString("parentTypeId").equals("SALES_INVOICE")"><display
description="${invoice.partyIdFrom}"/></field>
<field position="1" name="partyIdFrom"
use-when="invoiceType.getString("parentTypeId").equals("PURCHASE_INVOICE")"><lookup
target-form-name="LookupPartyName"/></field>
<field position="2" name="partyIdTo" entry-name="partyId"
parameter-name="partyId"
use-when="invoiceType.getString("parentTypeId").equals("PURCHASE_INVOICE")"><display
description="${invoice.partyId}"/></field>
@@ -340,7 +340,7 @@
</drop-down>
</field>
<field position="2" name="recurrenceInfoId"><text size="10"/></field>
- <field position="1" name="invoiceMessage"><text size="100"/></field>
+ <field position="1" name="invoiceMessage" encode-output="false"><text
size="100"/></field>
<!--field position="2" name="invoiceAmount"
use-when="invoiceId!=null"><display/></field-->
<field position="1" name="updateButton" widget-style="smallSubmit"
use-when="invoice!=null&&invoice.getString("statusId").equals("INVOICE_IN_PROCESS")">
<submit button-type="button"/>
