svn commit: r1527171 - in /ofbiz/trunk/applications/accounting: config/AccountingEntityLabels.xml widget/InvoiceForms.xml widget/InvoiceScreens.xml

[jl...@apache.org]

Author: jleroux
Date: Sat Sep 28 09:24:33 2013
New Revision: 1527171

URL: http://svn.apache.org/r1527171
Log:
Fixes an issue with InvoiceItemTypes reported by Christian on dev ML following proposed Nicolas's solution. 
I did not get further enough to add missing labels, like InvoiceItemType.description.SINVOICE_HEAD_ADJ, etc.
So when missing the default English description set in data seed is used

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml
    ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml
    ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml?rev=1527171&r1=1527170&r2=1527171&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml Sat Sep 28 09:24:33 2013
@@ -2704,7 +2704,7 @@
     <property key="InvoiceItemType.description.INVOICE_ADJ">
         <value xml:lang="de">Rechnungsanpassung</value>
         <value xml:lang="en">Invoice Adjustment</value>
-        <value xml:lang="fr">Régularisation de facture</value>
+        <value xml:lang="fr">Régularisation de facture (ventes)</value>
         <value xml:lang="hi_IN">चालान समायोजन</value>
         <value xml:lang="it">Fattura </value>
         <value xml:lang="ja">請求 調整</value>
@@ -3479,7 +3479,7 @@
     <property key="InvoiceItemType.description.PINVOICE_ADJ">
         <value xml:lang="de">Rechnungskorrektur</value>
         <value xml:lang="en">Invoice Adjustment</value>
-        <value xml:lang="fr">Régularisation de facture</value>
+        <value xml:lang="fr">Régularisation de facture (achat)</value>
         <value xml:lang="hi_IN">चालान समायोजन</value>
         <value xml:lang="it">Fattura Aggiustamento</value>
         <value xml:lang="ja">請求 調整</value>

Modified: ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml?rev=1527171&r1=1527170&r2=1527171&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml Sat Sep 28 09:24:33 2013
@@ -367,7 +367,7 @@ under the License.
        <field name="quantity"><text size="3"/></field>
        <field name="invoiceItemTypeId">
            <drop-down allow-empty="false">
-               <list-options list-name="invoiceItemTypes" key-name="invoiceItemTypeId" description="${groovy:uiLabelMap.get('InvoiceItemType.description.'+invoiceItemTypeId)}"/>
+               <entity-options entity-name="InvoiceItemType" description="${description}" key-field-name="invoiceItemTypeId"/>
            </drop-down>
        </field>
        <field name="productId"><lookup target-form-name="LookupProduct" size="20"/></field>

Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=1527171&r1=1527170&r2=1527171&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Sat Sep 28 09:24:33 2013
@@ -438,7 +438,6 @@ under the License.
                     <field-map field-name="invoiceId" from-field="parameters.invoiceId"/>
                     <order-by field-name="invoiceItemSeqId"/>
                 </entity-and>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/GetInvoiceItemTypes.groovy"/>
                 <entity-condition entity-name="InvoiceItemType" list="PayrolGroup">
                     <condition-expr field-name="parentTypeId" value="PAYROL"/>
                 </entity-condition>