[ofbiz-framework] branch trunk updated: Improved: Invoice import is not visible from UI and not working (OFBIZ-12089)

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 06e56ed  Improved: Invoice import is not visible from UI and not working (OFBIZ-12089)
06e56ed is described below

commit 06e56ed7e974ebfa607fad16bb0b013c4c68a8a5
Author: Jacques Le Roux <[hidden email]>
AuthorDate: Tue Dec 8 17:21:11 2020 +0100

    Improved: Invoice import is not visible from UI and not working (OFBIZ-12089)
   
    While working on OFBIZ-12080 I found an upload feature that allows to import
    invoices but it's not visible from UI and not working.
    Moreover the export feature was missing a parameters as the import.
   
    It has been introduced by Hans Bakker with
    https://svn.apache.org/repos/asf/ofbiz/trunk@1502093
    and I'm not sure the integration was completed.
   
    We could remove it, but I think it can be useful and does not seem to miss much
    to work fine.
   
    Also use an uploadedFile label in ImportParty and UploadContent forms
---
 applications/accounting/widget/GlSetupForms.xml                | 8 ++++----
 applications/accounting/widget/GlSetupScreens.xml              | 2 +-
 applications/party/widget/partymgr/CommunicationEventForms.xml | 2 +-
 applications/party/widget/partymgr/PartyForms.xml              | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/applications/accounting/widget/GlSetupForms.xml b/applications/accounting/widget/GlSetupForms.xml
index 6b3ebf6..38fc0ae 100644
--- a/applications/accounting/widget/GlSetupForms.xml
+++ b/applications/accounting/widget/GlSetupForms.xml
@@ -90,7 +90,7 @@ under the License.
     </form>
 
     <form name="ExportInvoice" type="single" target="ExportInvoiceCsv.csv" title="" >
-        <field name="organizationPartyId"><hidden value="${parameters.organizationPartyId}"/></field>
+        <field name="organizationPartyId"><hidden value="${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>
@@ -132,9 +132,9 @@ under the License.
         <field name="amount" title="amount"><display/></field>
     </form>
     
-    <form name="ImportInvoice" type="upload" target="ImportInvoice" title="" >
-        <field name="organizationPartyId"><hidden value="${parameters.organizationPartyId}"/></field>
-        <field name="uploadedFile"><file/></field>
+    <form name="ImportInvoice" type="upload" target="ImportInvoice" title="">
+        <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
+        <field name="uploadedFile" title="${uiLabelMap.ContentFile}"><file/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpload}"><submit button-type="button"/></field>
     </form>
 
diff --git a/applications/accounting/widget/GlSetupScreens.xml b/applications/accounting/widget/GlSetupScreens.xml
index b2eee02..0a2e76e 100644
--- a/applications/accounting/widget/GlSetupScreens.xml
+++ b/applications/accounting/widget/GlSetupScreens.xml
@@ -104,7 +104,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <screenlet title="${uiLabelMap.AccountingInvoice} ${uiLabelMap.CommonImportExport}  ${uiLabelMap.CommonFor}: ${partyGroup.groupName} [${organizationPartyId}]">
+                        <screenlet title="${uiLabelMap.AccountingInvoice} ${uiLabelMap.CommonImportExport} ${uiLabelMap.CommonFor}: ${partyGroup.groupName} [${organizationPartyId}]">
                             <container style="lefthalf">
                                 <label style="h2">${uiLabelMap.CommonImport}</label>
                                 <include-form name="ImportInvoice" location="component://accounting/widget/GlSetupForms.xml"/>
diff --git a/applications/party/widget/partymgr/CommunicationEventForms.xml b/applications/party/widget/partymgr/CommunicationEventForms.xml
index 20b8fd2..5413346 100644
--- a/applications/party/widget/partymgr/CommunicationEventForms.xml
+++ b/applications/party/widget/partymgr/CommunicationEventForms.xml
@@ -873,7 +873,7 @@ under the License.
         <field name="origCommEventId"><hidden value="${communicationEvent.origCommEventId}"/></field>
         <field name="my"><hidden value="${my}"/></field>
         <field name="contentId" title="${uiLabelMap.FormFieldTitle_existContentId}"><lookup target-form-name="LookupTreeContent"/></field>
-        <field name="uploadedFile"><file/></field>
+        <field name="uploadedFile" title="${uiLabelMap.ContentFile}"><file/></field>
         <field name="contentIdFrom" title="${uiLabelMap.ContentCompDocParentContentId}"><lookup target-form-name="LookupDetailContentTree"/></field>
         <field name="send" title="${uiLabelMap.CommonUpload}">
             <submit button-type="button"/>
diff --git a/applications/party/widget/partymgr/PartyForms.xml b/applications/party/widget/partymgr/PartyForms.xml
index 52f2337..ce4e743 100644
--- a/applications/party/widget/partymgr/PartyForms.xml
+++ b/applications/party/widget/partymgr/PartyForms.xml
@@ -1434,7 +1434,7 @@ under the License.
     </grid>
     
     <form name="ImportParty" type="upload" target="uploadParty" title="" >
-        <field name="uploadedFile"><file/></field>
+        <field name="uploadedFile" title="${uiLabelMap.ContentFile}"><file/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpload}"><submit button-type="button"/></field>
     </form>