svn commit: r1502149 - in /ofbiz/trunk/applications/accounting: webapp/accounting/WEB-INF/controller.xml widget/GlSetupForms.xml widget/GlSetupScreens.xml

[hansbak-2]

Author: hansbak
Date: Thu Jul 11 08:33:24 2013
New Revision: 1502149

URL: http://svn.apache.org/r1502149
Log:
more consistent namimg of requests,screens and forms for import/export invoices

Modified:
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
    ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml
    ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=1502149&r1=1502148&r2=1502149&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Thu Jul 11 08:33:24 2013
@@ -759,12 +759,11 @@ under the License.
         <security https="true" auth="true"/>
         <response name="success" type="view" value="ImportExport"/>
     </request-map>
-    
-    <request-map uri="PartyAccountsExportInvoicesCsv.csv">
+    <request-map uri="ExportInvoiceCsv.csv">
         <security https="true" auth="true"/>
-        <response name="success" type="view" value="PartyAccountsExportInvoicesCsv"/>
+        <response name="success" type="view" value="ExportInvoicesCsv"/>
     </request-map>
-    <request-map uri="uploadInvoice">
+    <request-map uri="ImportInvoice">
         <security auth="true" https="true"/>
         <event invoke="importInvoice" path="" type="service"/>
         <response name="success" type="request" value="ImportExport"/>
@@ -2787,7 +2786,7 @@ under the License.
 
     <!-- import export -->
     <view-map name="ImportExport" type="screen" page="component://accounting/widget/GlSetupScreens.xml#ImportExport"/>
-    <view-map name="PartyAccountsExportInvoicesCsv" type="screencsv" page="component://accounting/widget/GlSetupScreens.xml#PartyAccountsExportInvoicesCsv" content-type="text/csv" encoding="none"/>
+    <view-map name="ExportInvoicesCsv" type="screencsv" page="component://accounting/widget/GlSetupScreens.xml#ExportInvoiceCsv" content-type="text/csv" encoding="none"/>
 
     <!-- Manual Credit Card Transaction -->
     <view-map name="FindGatewayResponses" page="component://accounting/widget/TransactionScreens.xml#FindGatewayResponses" type="screen"/>

Modified: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml?rev=1502149&r1=1502148&r2=1502149&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml Thu Jul 11 08:33:24 2013
@@ -76,14 +76,14 @@ under the License.
         <field name="submitButton" title="${uiLabelMap.AccountingNewCompany}"><submit button-type="button"/></field>
     </form>
 
-    <form name="ExportInvoice" type="single" target="PartyAccountsExportInvoicesCsv.csv" title="" >
+    <form name="ExportInvoice" type="single" target="ExportInvoiceCsv.csv" title="" >
         <field name="organizationPartyId"><hidden value="${parameters.organizationPartyId}"/></field>
         <field name="invoiceId"><lookup target-form-name="LookupInvoice"/></field>
         <field name="startDate"><date-time/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field>
     </form>
 
-    <form name="PartyAccountsExportInvoicesCsv" list-name="listIt" target="" title="" type="list" view-size="99999"
+    <form name="ExportInvoiceCsv" list-name="listIt" target="" title="" type="list" view-size="99999"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" paginate="false">
         <actions>
             <entity-condition entity-name="InvoiceExport">
@@ -119,7 +119,7 @@ under the License.
         <field name="amount" title="amount"><display/></field>
     </form>
     
-    <form name="ImportInvoice" type="upload" target="uploadInvoice" title="" >
+    <form name="ImportInvoice" type="upload" target="ImportInvoice" title="" >
         <field name="organizationPartyId"><hidden value="${parameters.organizationPartyId}"/></field>
         <field name="uploadedFile"><file/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpload}"><submit button-type="button"/></field>

Modified: ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml?rev=1502149&r1=1502148&r2=1502149&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml Thu Jul 11 08:33:24 2013
@@ -118,6 +118,18 @@ under the License.
             </widgets>
         </section>
     </screen>
+    <screen name="ExportInvoiceCsv">
+        <section>
+            <actions>
+                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+                <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
+            </actions>
+            <widgets>
+                    <include-form name="ExportInvoiceCsv" location="component://accounting/widget/GlSetupForms.xml"/>          
+            </widgets>
+        </section>
+    </screen>
     <screen name="ListGlAccountOrganization">
         <section>
             <actions>
@@ -583,18 +595,6 @@ under the License.
             </widgets>
         </section>
     </screen>
-    <screen name="PartyAccountsExportInvoicesCsv">
-        <section>
-            <actions>
-                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
-                <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
-            </actions>
-            <widgets>
-                    <include-form name="PartyAccountsExportInvoicesCsv" location="component://accounting/widget/GlSetupForms.xml"/>          
-            </widgets>
-        </section>
-    </screen>
     <screen name="FindGlAccountCategory">
         <section>
             <actions>