Author: deepak
Date: Sat Jun 11 05:54:25 2016
New Revision: 1747849
URL: http://svn.apache.org/viewvc?rev=1747849&view=rev
Log:
(OFBIZ-7219) Relocate .groovy files in the accounting ap and ar webapp.
Added:
ofbiz/trunk/applications/accounting/groovyScripts/ap/
- copied from r1747847,
ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/actions/
ofbiz/trunk/applications/accounting/groovyScripts/ar/
- copied from r1747847,
ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/actions/
Removed:
ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/actions/
ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/actions/
Modified:
ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
ofbiz/trunk/applications/accounting/widget/ap/ApPrintScreens.xml
ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml
ofbiz/trunk/applications/accounting/widget/ar/ArPaymentScreens.xml
Modified: ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml?rev=1747849&r1=1747848&r2=1747849&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml Sat Jun 11
05:54:25 2016
@@ -390,7 +390,7 @@ under the License.
<set field="partyIdFrom" from-field="parameters.partyIdFrom"/>
<set field="organizationPartyId"
from-field="parameters.organizationPartyId"/>
<entity-one entity-name="FinAccount" value-field="finAccount"/>
- <script
location="component://accounting/webapp/ar/WEB-INF/actions/BatchPayments.groovy"/>
+ <script
location="component://accounting/groovyScripts/ar/BatchPayments.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonFinAccountDecorator"
location="${parameters.finAccountDecoratorLocation}">
Modified: ofbiz/trunk/applications/accounting/widget/ap/ApPrintScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/ApPrintScreens.xml?rev=1747849&r1=1747848&r2=1747849&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/ApPrintScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/ApPrintScreens.xml Sat Jun 11
05:54:25 2016
@@ -27,7 +27,7 @@ under the License.
<property-map resource="CommonUiLabels" map-name="uiLabelMap"
global="true"/>
<property-map resource="AccountingUiLabels"
map-name="uiLabelMap" global="true"/>
<property-map resource="ManufacturingUiLabels"
map-name="uiLabelMap" global="true"/>
- <script
location="component://accounting/webapp/ap/WEB-INF/actions/invoices/CommissionReport.groovy"/>
+ <script
location="component://accounting/groovyScripts/ap/invoices/CommissionReport.groovy"/>
</actions>
<widgets>
<decorator-screen name="FoReportDecorator"
location="component://common/widget/CommonScreens.xml">
Modified: ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml?rev=1747849&r1=1747848&r2=1747849&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml Sat Jun 11
05:54:25 2016
@@ -167,7 +167,7 @@ under the License.
<set field="titleProperty"
value="AccountingFindSalesInvoicesForCommissionRun"/>
<set field="tabButtonItem" value="commissionRun"/>
<set field="salesRepPartyList" type="List"
from-field="parameters.partyIds"/>
- <script
location="component://accounting/webapp/ap/WEB-INF/actions/invoices/CommissionRun.groovy"/>
+ <script
location="component://accounting/groovyScripts/ap/invoices/CommissionRun.groovy"/>
<!-- asmslect parameters, must be prefixed by asm_ for
SetMultipleSelectJs.ftl -->
<set field="asm_multipleSelectForm" value="CommissionRun"/>
@@ -207,7 +207,7 @@ under the License.
<actions>
<set field="titleProperty" value="AccountingCommissionReport"/>
<set field="tabButtonItem" value="commissionReport"/>
- <script
location="component://accounting/webapp/ap/WEB-INF/actions/invoices/CommissionReport.groovy"/>
+ <script
location="component://accounting/groovyScripts/ap/invoices/CommissionReport.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonApReportDecorator"
location="${parameters.mainDecoratorLocation}">
Modified: ofbiz/trunk/applications/accounting/widget/ar/ArPaymentScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/ArPaymentScreens.xml?rev=1747849&r1=1747848&r2=1747849&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/ArPaymentScreens.xml
(original)
+++ ofbiz/trunk/applications/accounting/widget/ar/ArPaymentScreens.xml Sat Jun
11 05:54:25 2016
@@ -64,7 +64,7 @@ under the License.
<set field="thruDate" type="Timestamp"
from-field="parameters.thruDate"/>
<set field="partyIdFrom" from-field="parameters.partyIdFrom"/>
<set field="organizationPartyId"
from-field="parameters.organizationPartyId"/>
- <script
location="component://accounting/webapp/ar/WEB-INF/actions/BatchPayments.groovy"/>
+ <script
location="component://accounting/groovyScripts/ar/BatchPayments.groovy"/>
<entity-and entity-name="FinAccount" list="finAccounts">
<field-map field-name="finAccountTypeId"
value="BANK_ACCOUNT"/>
</entity-and>
