Re: svn commit: r1674587 - in /ofbiz/trunk/applications/accounting: webapp/accounting/WEB-INF/controller.xml widget/TaxAuthorityForms.xml widget/TaxAuthorityMenus.xml widget/TaxAuthorityScreens.xml

[Adrian Crum-3]

Don't forget that <form type="list"> is now a <grid>.

Adrian Crum
Sandglass Software
www.sandglass-software.com

On 4/18/2015 11:48 PM, [hidden email] wrote:

> Author: jleroux
> Date: Sat Apr 18 22:48:01 2015
> New Revision: 1674587
>
> URL: http://svn.apache.org/r1674587
> Log:
> A patch from Pierre Smits "Add a basic VAT report with frequency setting" https://issues.apache.org/jira/browse/OFBIZ-6225
>
> This is a 1st stage, we will add more later, notably totals as a 1st step and then a more complete report but still basic
>
> Modified:
>      ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
>      ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml
>      ofbiz/trunk/applications/accounting/widget/TaxAuthorityMenus.xml
>      ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.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=1674587&r1=1674586&r2=1674587&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
> +++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Sat Apr 18 22:48:01 2015
> @@ -1566,6 +1566,12 @@ under the License.
>           <response name="success" type="view" value="EditTaxAuthorityPartyInfo"/>
>           <response name="error" type="view" value="EditTaxAuthorityPartyInfo"/>
>       </request-map>
> +    <request-map uri="FindTaxAuthorityReport">
> +        <security https="true" auth="true"/>
> +        <response name="success" type="view" value="FindTaxAuthorityReport"/>
> +        <response name="error" type="view" value="FindTaxAuthorityReport"/>
> +    </request-map>
> +
>
>       <!-- ================ Administratvie Requests ================ -->
>       <request-map uri="ListCompanies">
> @@ -2844,7 +2850,8 @@ under the License.
>       <view-map name="EditTaxAuthorityRateProducts" type="screen" page="component://accounting/widget/TaxAuthorityScreens.xml#EditTaxAuthorityRateProducts"/>
>       <view-map name="ListTaxAuthorityParties" type="screen" page="component://accounting/widget/TaxAuthorityScreens.xml#ListTaxAuthorityParties"/>
>       <view-map name="EditTaxAuthorityPartyInfo" type="screen" page="component://accounting/widget/TaxAuthorityScreens.xml#EditTaxAuthorityPartyInfo"/>
> -
> +    <view-map name="FindTaxAuthorityReport" type="screen" page="component://accounting/widget/TaxAuthorityScreens.xml#FindTaxAuthorityReport"/>
> +
>       <!-- administrative pages -->
>       <view-map name="ListCompanies" type="screen" page="component://accounting/widget/GlSetupScreens.xml#ListCompanies"/>
>       <view-map name="AddCompany" type="screen" page="component://accounting/widget/GlSetupScreens.xml#AddCompany"/>
>
> Modified: ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml?rev=1674587&r1=1674586&r2=1674587&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml (original)
> +++ ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml Sat Apr 18 22:48:01 2015
> @@ -405,4 +405,33 @@ under the License.
>           <field use-when="partyTaxAuthInfo!=null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field>
>           <field use-when="partyTaxAuthInfo==null" name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field>
>       </form>
> +
> +
> +    <!-- Tax Authority Tax Reports forms -->
> +    <form name="FindTaxAuthorityReport" type="single" target="FindTaxAuthorityReport"
> +        title="Find and list VAT report for a tax authority, my month, quater or other period"
> +        header-row-style="header-row" default-table-style="basic-table">
> +        <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
> +        <field name="hideSearch"><hidden value="Y"/></field>
> +        <field name="taxAuthPartyId"><hidden/></field>
> +        <field name="taxAuthGeoId"><hidden/></field>
> +        <field name="invoiceDate"><date-find type="date" default-option-from="greaterThanFromDayStart" default-option-thru="upThruDay"/></field>
> +        <field name="submitButton" title="${uiLabelMap.CommonSearch}" widget-style="buttontext" >
> +            <submit button-type="button"/>
> +        </field>
> +    </form>
> +
> +    <form name="ListTaxAuthorityReport" list-name="listIt" title="" type="list"
> +        odd-row-style="alternate-row" header-row-style="header-row-2"
> +        default-table-style="basic-table hover-bar">
> +        <actions>
> +            <service service-name="performFind" result-map="result" result-map-list="listIt">
> +                <field-map field-name="inputFields" from-field="parameters"/>
> +                <field-map field-name="entityName" value="InvoiceItem"/>
> +                <field-map field-name="viewIndex" from-field="viewIndex"/>
> +                <field-map field-name="viewSize" from-field="viewSize"/>
> +            </service>
> +        </actions>
> +        <auto-fields-entity entity-name="InvoiceItem" default-field-type="display"/>
> +    </form>
>   </forms>
>
> Modified: ofbiz/trunk/applications/accounting/widget/TaxAuthorityMenus.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TaxAuthorityMenus.xml?rev=1674587&r1=1674586&r2=1674587&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/widget/TaxAuthorityMenus.xml (original)
> +++ ofbiz/trunk/applications/accounting/widget/TaxAuthorityMenus.xml Sat Apr 18 22:48:01 2015
> @@ -59,5 +59,11 @@ under the License.
>                   <parameter param-name="taxAuthGeoId"/>
>               </link>
>           </menu-item>
> +        <menu-item name="FindTaxAuthorityReport" title="${uiLabelMap.CommonReport}">
> +            <link target="FindTaxAuthorityReport">
> +                <parameter param-name="taxAuthPartyId"/>
> +                <parameter param-name="taxAuthGeoId"/>
> +            </link>
> +        </menu-item>
>       </menu>
>   </menus>
>
> Modified: ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml?rev=1674587&r1=1674586&r2=1674587&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml (original)
> +++ ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml Sat Apr 18 22:48:01 2015
> @@ -264,4 +264,28 @@ under the License.
>               </widgets>
>           </section>
>       </screen>
> +
> +    <!-- reporting -->
> +    <screen name="FindTaxAuthorityReport">
> +        <section>
> +            <actions>
> +                <set field="headerItem" value="invoices"/>
> +                <set field="titleProperty" value="TaxAuthorityReport"/>
> +                <set field="tabButtonItem" value="FindTaxAuthorityReport"/>
> +            </actions>
> +            <widgets>
> +                <decorator-screen name="CommonTaxAuthorityDecorator" location="${parameters.taxAuthDecoratorLocation}">
> +                    <decorator-section name="body">
> +                        <screenlet title="${uiLabelMap.CommonFind}">
> +                            <include-form name="FindTaxAuthorityReport" location="component://accounting/widget/TaxAuthorityForms.xml"/>
> +                        </screenlet>
> +                        <screenlet title="${uiLabelMap.CommonSearchResults}" navigation-form-name="ListTaxAuthorityReport">
> +                            <include-form name="ListTaxAuthorityReport" location="component://accounting/widget/TaxAuthorityForms.xml"/>
> +                        </screenlet>
> +                    </decorator-section>
> +                </decorator-screen>
> +            </widgets>
> +        </section>
> +    </screen>
> +
>   </screens>
>
>

[Jacques Le Roux]

Thanks Adrian,

Has this been discussed before? I completely missed this change when you committed it (just began to review).
What differ from <form type="list"> (I guess the rendering is better, but how)? Should we not mark the type="list" as deprecated?

I just re-read this https://issues.apache.org/jira/browse/OFBIZ-6402?focusedCommentId=14556552 nothing to add there?
Should we not update/improve/enhance the documentation in widget-form.xsd, for instance this seems contradictory to me
     "In both widgets, the type attribute is not needed"
     <xs:element name="grid">
         <xs:documentation>The form type is always required unless you are extending another form.</xs:documentation>

Thanks

Jacques

Le 19/04/2015 00:57, Adrian Crum a écrit :

> Don't forget that <form type="list"> is now a <grid>.
>
> Adrian Crum
> Sandglass Software
> www.sandglass-software.com
>
> On 4/18/2015 11:48 PM, [hidden email] wrote:
>> Author: jleroux
>> Date: Sat Apr 18 22:48:01 2015
>> New Revision: 1674587
>>
>> URL: http://svn.apache.org/r1674587
>> Log:
>> A patch from Pierre Smits "Add a basic VAT report with frequency setting" https://issues.apache.org/jira/browse/OFBIZ-6225
>>
>> This is a 1st stage, we will add more later, notably totals as a 1st step and then a more complete report but still basic
>>
>> Modified:
>> ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
>> ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml
>> ofbiz/trunk/applications/accounting/widget/TaxAuthorityMenus.xml
>> ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.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=1674587&r1=1674586&r2=1674587&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
>> +++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Sat Apr 18 22:48:01 2015
>> @@ -1566,6 +1566,12 @@ under the License.
>>           <response name="success" type="view" value="EditTaxAuthorityPartyInfo"/>
>>           <response name="error" type="view" value="EditTaxAuthorityPartyInfo"/>
>>       </request-map>
>> +    <request-map uri="FindTaxAuthorityReport">
>> +        <security https="true" auth="true"/>
>> +        <response name="success" type="view" value="FindTaxAuthorityReport"/>
>> +        <response name="error" type="view" value="FindTaxAuthorityReport"/>
>> +    </request-map>
>> +
>>
>>       <!-- ================ Administratvie Requests ================ -->
>>       <request-map uri="ListCompanies">
>> @@ -2844,7 +2850,8 @@ under the License.
>>       <view-map name="EditTaxAuthorityRateProducts" type="screen"
>> page="component://accounting/widget/TaxAuthorityScreens.xml#EditTaxAuthorityRateProducts"/>
>>       <view-map name="ListTaxAuthorityParties" type="screen" page="component://accounting/widget/TaxAuthorityScreens.xml#ListTaxAuthorityParties"/>
>>       <view-map name="EditTaxAuthorityPartyInfo" type="screen" page="component://accounting/widget/TaxAuthorityScreens.xml#EditTaxAuthorityPartyInfo"/>
>> -
>> +    <view-map name="FindTaxAuthorityReport" type="screen" page="component://accounting/widget/TaxAuthorityScreens.xml#FindTaxAuthorityReport"/>
>> +
>>       <!-- administrative pages -->
>>       <view-map name="ListCompanies" type="screen" page="component://accounting/widget/GlSetupScreens.xml#ListCompanies"/>
>>       <view-map name="AddCompany" type="screen" page="component://accounting/widget/GlSetupScreens.xml#AddCompany"/>
>>
>> Modified: ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml?rev=1674587&r1=1674586&r2=1674587&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml (original)
>> +++ ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml Sat Apr 18 22:48:01 2015
>> @@ -405,4 +405,33 @@ under the License.
>>           <field use-when="partyTaxAuthInfo!=null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit
>> button-type="text-link"/></field>
>>           <field use-when="partyTaxAuthInfo==null" name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit
>> button-type="text-link"/></field>
>>       </form>
>> +
>> +
>> +    <!-- Tax Authority Tax Reports forms -->
>> +    <form name="FindTaxAuthorityReport" type="single" target="FindTaxAuthorityReport"
>> +        title="Find and list VAT report for a tax authority, my month, quater or other period"
>> +        header-row-style="header-row" default-table-style="basic-table">
>> +        <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
>> +        <field name="hideSearch"><hidden value="Y"/></field>
>> +        <field name="taxAuthPartyId"><hidden/></field>
>> +        <field name="taxAuthGeoId"><hidden/></field>
>> +        <field name="invoiceDate"><date-find type="date" default-option-from="greaterThanFromDayStart" default-option-thru="upThruDay"/></field>
>> +        <field name="submitButton" title="${uiLabelMap.CommonSearch}" widget-style="buttontext" >
>> +            <submit button-type="button"/>
>> +        </field>
>> +    </form>
>> +
>> +    <form name="ListTaxAuthorityReport" list-name="listIt" title="" type="list"
>> +        odd-row-style="alternate-row" header-row-style="header-row-2"
>> +        default-table-style="basic-table hover-bar">
>> +        <actions>
>> +            <service service-name="performFind" result-map="result" result-map-list="listIt">
>> +                <field-map field-name="inputFields" from-field="parameters"/>
>> +                <field-map field-name="entityName" value="InvoiceItem"/>
>> +                <field-map field-name="viewIndex" from-field="viewIndex"/>
>> +                <field-map field-name="viewSize" from-field="viewSize"/>
>> +            </service>
>> +        </actions>
>> +        <auto-fields-entity entity-name="InvoiceItem" default-field-type="display"/>
>> +    </form>
>>   </forms>
>>
>> Modified: ofbiz/trunk/applications/accounting/widget/TaxAuthorityMenus.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TaxAuthorityMenus.xml?rev=1674587&r1=1674586&r2=1674587&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/accounting/widget/TaxAuthorityMenus.xml (original)
>> +++ ofbiz/trunk/applications/accounting/widget/TaxAuthorityMenus.xml Sat Apr 18 22:48:01 2015
>> @@ -59,5 +59,11 @@ under the License.
>>                   <parameter param-name="taxAuthGeoId"/>
>>               </link>
>>           </menu-item>
>> +        <menu-item name="FindTaxAuthorityReport" title="${uiLabelMap.CommonReport}">
>> +            <link target="FindTaxAuthorityReport">
>> +                <parameter param-name="taxAuthPartyId"/>
>> +                <parameter param-name="taxAuthGeoId"/>
>> +            </link>
>> +        </menu-item>
>>       </menu>
>>   </menus>
>>
>> Modified: ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml?rev=1674587&r1=1674586&r2=1674587&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml (original)
>> +++ ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml Sat Apr 18 22:48:01 2015
>> @@ -264,4 +264,28 @@ under the License.
>>               </widgets>
>>           </section>
>>       </screen>
>> +
>> +    <!-- reporting -->
>> +    <screen name="FindTaxAuthorityReport">
>> +        <section>
>> +            <actions>
>> +                <set field="headerItem" value="invoices"/>
>> +                <set field="titleProperty" value="TaxAuthorityReport"/>
>> +                <set field="tabButtonItem" value="FindTaxAuthorityReport"/>
>> +            </actions>
>> +            <widgets>
>> +                <decorator-screen name="CommonTaxAuthorityDecorator" location="${parameters.taxAuthDecoratorLocation}">
>> +                    <decorator-section name="body">
>> +                        <screenlet title="${uiLabelMap.CommonFind}">
>> +                            <include-form name="FindTaxAuthorityReport" location="component://accounting/widget/TaxAuthorityForms.xml"/>
>> +                        </screenlet>
>> +                        <screenlet title="${uiLabelMap.CommonSearchResults}" navigation-form-name="ListTaxAuthorityReport">
>> +                            <include-form name="ListTaxAuthorityReport" location="component://accounting/widget/TaxAuthorityForms.xml"/>
>> +                        </screenlet>
>> +                    </decorator-section>
>> +                </decorator-screen>
>> +            </widgets>
>> +        </section>
>> +    </screen>
>> +
>>   </screens>
>>
>>
>