Author: deepak
Date: Fri Jul 8 08:08:23 2016
New Revision: 1751865
URL: http://svn.apache.org/viewvc?rev=1751865&view=rev
Log:
(OFBIZ-7764) Removed TaxAuthorityVATReport forms and related controller
request, as its mark as WIP since 2009.
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.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=1751865&r1=1751864&r2=1751865&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
Fri Jul 8 08:08:23 2016
@@ -2387,12 +2387,6 @@ under the License.
<response name="success" type="view" value="FixedAssetTypeGlAccounts"/>
<response name="error" type="view" value="FixedAssetTypeGlAccounts"/>
</request-map>
- <!-- Commented out for now WIP
- <request-map uri="taxAuthorityVATReport">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="taxAuthorityVATReport"/>
- </request-map>
- Commented out for now WIP -->
<!-- GeoLocation-->
<request-map uri="FixedAssetGeoLocation">
@@ -2853,11 +2847,6 @@ under the License.
<!-- Agreements Views -->
<view-map name="EditAgreementRoles" type="screen"
page="component://accounting/widget/AgreementScreens.xml#EditAgreementRoles"/>
- <!-- Commented out for now WIP
- <view-map name="findTaxAuthorityVATReport" type="screen"
page="component://accounting/widget/TaxAuthorityForms.xml#FindTaxAuthorityVATReport"/>
- <view-map name="taxAuthorityVATReport" type="screen"
page="component://accounting/widget/TaxAuthorityForms.xml#TaxAuthorityVATReport"/>
- Commented out for now WIP-->
-
<view-map name="FixedAssetGeoLocation" type="screen"
page="component://accounting/widget/FixedAssetScreens.xml#FixedAssetGeoLocation"/>
<view-map name="AcctgTransEntriesSearchResultsCsv" type="screencsv"
page="component://accounting/widget/GlScreens.xml#AcctgTransEntriesSearchResultsCsv"
content-type="text/csv" encoding="none"/>
<view-map name="AcctgTransEntriesSearchResultsPdf" type="screenfop"
page="component://accounting/widget/GlScreens.xml#AcctgTransEntriesSearchResultsPdf"
content-type="application/pdf" encoding="none"/>
Modified: ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml?rev=1751865&r1=1751864&r2=1751865&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml Fri Jul 8
08:08:23 2016
@@ -405,61 +405,6 @@ 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="TaxAuthorityVATReport" type="list" target="" title="VAT
report for a tax authority, my month, quater or other period"
- list-name="listIt" target="" default-entity-name="InvoiceItem"
paginate-target="findInvoices"-->
-
- <form name="FindTaxAuthorityVATReport" type="single"
target="findTaxAuthorityVATReport"
- 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"><text-find default-option="contains"
ignore-case="true"/></field>
- <field name="fromDate"><text-find default-option="contains"
ignore-case="true"/></field>
- <field name="ThruDate"><text-find default-option="contains"
ignore-case="true"/></field>
- </form>
-
- <form name="TaxAuthorityVATReport" type="list" separate-columns="true"
title="Invoice List" list-name="listIt" target="" default-entity-name="Invoice"
paginate-target="findInvoices"
- odd-row-style="alternate-row" 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="Invoice"/>
- <field-map field-name="orderBy" value="invoiceDate DESC"/>
- </service>
- </actions>
- <row-actions>
- <service service-name="getPartyNameForDate"
result-map="partyNameResultFrom">
- <field-map field-name="partyId" from-field="partyIdFrom"/>
- <field-map field-name="compareDate" from-field="invoiceDate"/>
- <field-map field-name="lastNameFirst" value="Y"/>
- </service>
- <service service-name="getPartyNameForDate"
result-map="partyNameResultTo">
- <field-map field-name="partyId" from-field="partyId"/>
- <field-map field-name="compareDate" from-field="invoiceDate"/>
- <field-map field-name="lastNameFirst" value="Y"/>
- </service>
- <set field="amountToApply"
value="${bsh:return(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId));}"
type="BigDecimal"/>
- <set field="total"
value="${bsh:return(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(delegator,invoiceId));}"
type="BigDecimal"/>
- </row-actions>
-
- <field name="invoiceId" widget-style="buttontext">
- <hyperlink description="${invoiceId}" target="invoiceOverview">
- <parameter param-name="invoiceId" from-field="invoiceId"/>
- </hyperlink>
- </field>
- <field name="invoiceTypeId"><display-entity entity-name="InvoiceType"
description="${description}"/></field>
- <field name="invoiceDate"><display/></field>
- <field name="statusId"><display-entity entity-name="StatusItem"
description="${description}"/></field>
- <field name="description"><display/></field>
- <field name="partyIdFrom"><display
description="${partyNameResultFrom.fullName} [${partyIdFrom}]"/></field>
- <field name="partyIdTo" parameter-name="partyId"><display
description="${partyNameResultTo.fullName} [${partyId}]"/></field>
- <field name="invoiceDate"><display
description="${bsh:invoiceDate.toString().substring(0,10)}"/></field>
- <field name="total" widget-area-style="align-text"><display
type="currency" currency="${currencyUomId}"/></field>
- <field name="amountToApply" widget-area-style="align-text"><display
type="currency" currency="${currencyUomId}"/></field>
- </form>
-
<!-- Tax Authority Tax Reports forms -->
<form name="FindTaxAuthorityReport" type="single"
target="FindTaxAuthorityReport"
