svn commit: r950941 - in /ofbiz/branches/release10.04/a
Locked
 
|
Author: mor
Date: Thu Jun 3 10:34:19 2010 New Revision: 950941 URL: http://svn.apache.org/viewvc?rev=950941&view=rev Log: Merged changes from trunk r950936 Added invoice lookup specific to Account Receivable and Account Payable application. This fix a bug with the status and invoice type that was showing up wrong values in the lookup screen used before. Added: ofbiz/branches/release10.04/applications/accounting/widget/ap/LookupScreens.xml ofbiz/branches/release10.04/applications/accounting/widget/ap/forms/LookupForms.xml ofbiz/branches/release10.04/applications/accounting/widget/ar/LookupScreens.xml ofbiz/branches/release10.04/applications/accounting/widget/ar/forms/LookupForms.xml Modified: ofbiz/branches/release10.04/applications/accounting/webapp/ap/WEB-INF/controller.xml ofbiz/branches/release10.04/applications/accounting/webapp/ar/WEB-INF/controller.xml Modified: ofbiz/branches/release10.04/applications/accounting/webapp/ap/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/webapp/ap/WEB-INF/controller.xml?rev=950941&r1=950940&r2=950941&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/webapp/ap/WEB-INF/controller.xml (original) +++ ofbiz/branches/release10.04/applications/accounting/webapp/ap/WEB-INF/controller.xml Thu Jun 3 10:34:19 2010 @@ -153,4 +153,6 @@ under the License. <!-- Vendor Mappings --> <view-map name="FindVendors" type="screen" page="component://accounting/widget/ap/CommonScreens.xml#FindVendors"/> <view-map name="EditVendor" type="screen" page="component://accounting/widget/ap/CommonScreens.xml#EditVendor"/> + + <view-map name="LookupInvoice" type="screen" page="component://accounting/widget/ap/LookupScreens.xml#LookupInvoice"/> </site-conf> Modified: ofbiz/branches/release10.04/applications/accounting/webapp/ar/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/webapp/ar/WEB-INF/controller.xml?rev=950941&r1=950940&r2=950941&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/webapp/ar/WEB-INF/controller.xml (original) +++ ofbiz/branches/release10.04/applications/accounting/webapp/ar/WEB-INF/controller.xml Thu Jun 3 10:34:19 2010 @@ -113,5 +113,6 @@ under the License. <view-map name="FindArInvoices" type="screen" page="component://accounting/widget/ar/InvoiceScreens.xml#FindArInvoices"/> <view-map name="NewSalesInvoice" type="screen" page="component://accounting/widget/ar/InvoiceScreens.xml#NewSalesInvoice"/> + <view-map name="LookupInvoice" type="screen" page="component://accounting/widget/ar/LookupScreens.xml#LookupInvoice"/> <!-- end of view mappings --> </site-conf> Added: ofbiz/branches/release10.04/applications/accounting/widget/ap/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/widget/ap/LookupScreens.xml?rev=950941&view=auto ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/widget/ap/LookupScreens.xml (added) +++ ofbiz/branches/release10.04/applications/accounting/widget/ap/LookupScreens.xml Thu Jun 3 10:34:19 2010 @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> + + <screen name="LookupInvoice"> + <section> + <condition> + <if-service-permission service-name="acctgBasePermissionCheck" main-action="VIEW"/> + </condition> + <actions> + <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> + <set field="title" value="${uiLabelMap.AccountingLookupInvoices}"/> + <set field="queryString" from-field="result.queryString"/> + <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> + <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/> + </actions> + <widgets> + <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="search-options"> + <include-form name="LookupInvoice" location="component://accounting/widget/ap/forms/LookupForms.xml"/> + </decorator-section> + <decorator-section name="search-results"> + <include-form name="listInvoice" location="component://accounting/widget/FieldLookupForms.xml"/> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> +</screens> \ No newline at end of file Added: ofbiz/branches/release10.04/applications/accounting/widget/ap/forms/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/widget/ap/forms/LookupForms.xml?rev=950941&view=auto ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/widget/ap/forms/LookupForms.xml (added) +++ ofbiz/branches/release10.04/applications/accounting/widget/ap/forms/LookupForms.xml Thu Jun 3 10:34:19 2010 @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> + + <form name="LookupInvoice" target="LookupInvoice" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> + <field position="1" name="invoiceId"><text-find/></field> + <field position="1" name="invoiceTypeId"> + <drop-down allow-empty="true" no-current-selected-key="PURCHASE_INVOICE"> + <entity-options description="${description}" entity-name="InvoiceType" key-field-name="invoiceTypeId"> + <entity-constraint name="parentTypeId" operator="equals" value="PURCHASE_INVOICE"/> + </entity-options> + </drop-down> + </field> + <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2"> + <drop-down allow-empty="true"> + <entity-options description="${description}" entity-name="StatusItem"> + <entity-constraint name="statusTypeId" operator="equals" value="INVOICE_STATUS"/> + <entity-constraint name="statusId" operator="not-equals" value="INVOICE_SENT"/> + </entity-options> + </drop-down> + </field> + <field position="1" name="partyIdFrom"><lookup target-form-name="LookupPartyName"/></field> + <field position="2" name="partyId" title="${uiLabelMap.AccountingPartyIdTo}"><lookup target-form-name="LookupPartyName"/></field> + <field position="1" name="Datefrom" title="${uiLabelMap.CommonFromDate}"><date-time/></field> + <field position="2" name="DateThru" title="${uiLabelMap.CommonThruDate}"><date-time/></field> + + <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> + </form> +</forms> \ No newline at end of file Added: ofbiz/branches/release10.04/applications/accounting/widget/ar/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/widget/ar/LookupScreens.xml?rev=950941&view=auto ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/widget/ar/LookupScreens.xml (added) +++ ofbiz/branches/release10.04/applications/accounting/widget/ar/LookupScreens.xml Thu Jun 3 10:34:19 2010 @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> + + <screen name="LookupInvoice"> + <section> + <condition> + <if-service-permission service-name="acctgBasePermissionCheck" main-action="VIEW"/> + </condition> + <actions> + <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> + <set field="title" value="${uiLabelMap.AccountingLookupInvoices}"/> + <set field="queryString" from-field="result.queryString"/> + <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> + <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/> + </actions> + <widgets> + <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="search-options"> + <include-form name="LookupInvoice" location="component://accounting/widget/ar/forms/LookupForms.xml"/> + </decorator-section> + <decorator-section name="search-results"> + <include-form name="listInvoice" location="component://accounting/widget/FieldLookupForms.xml"/> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> +</screens> \ No newline at end of file Added: ofbiz/branches/release10.04/applications/accounting/widget/ar/forms/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/widget/ar/forms/LookupForms.xml?rev=950941&view=auto ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/widget/ar/forms/LookupForms.xml (added) +++ ofbiz/branches/release10.04/applications/accounting/widget/ar/forms/LookupForms.xml Thu Jun 3 10:34:19 2010 @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> + + <form name="LookupInvoice" target="LookupInvoice" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> + <field position="1" name="invoiceId"><text-find/></field> + <field position="1" name="invoiceTypeId"> + <drop-down allow-empty="true" no-current-selected-key="SALES_INVOICE"> + <entity-options description="${description}" entity-name="InvoiceType" key-field-name="invoiceTypeId"> + <entity-constraint name="parentTypeId" operator="equals" value="SALES_INVOICE"/> + </entity-options> + </drop-down> + </field> + <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2"> + <drop-down allow-empty="true"> + <entity-options description="${description}" entity-name="StatusItem"> + <entity-constraint name="statusTypeId" operator="equals" value="INVOICE_STATUS"/> + <entity-constraint name="statusId" operator="not-equals" value="INVOICE_RECEIVED"/> + </entity-options> + </drop-down> + </field> + <field position="1" name="partyIdFrom"><lookup target-form-name="LookupPartyName"/></field> + <field position="2" name="partyId" title="${uiLabelMap.AccountingPartyIdTo}"><lookup target-form-name="LookupPartyName"/></field> + <field position="1" name="Datefrom" title="${uiLabelMap.CommonFromDate}"><date-time/></field> + <field position="2" name="DateThru" title="${uiLabelMap.CommonThruDate}"><date-time/></field> + + <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> + </form> +</forms> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |