OFBiz › OFBiz - Commits

svn commit: r802334 - in /ofbiz/trunk/applications/accounting: config/ webapp/accounting/invoice/ webapp/ap/WEB-INF/ webapp/ar/WEB-INF/ widget/ap/ widget/ap/forms/ widget/ar/ widget/ar/forms/

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

apatel-2

svn commit: r802334 - in /ofbiz/trunk/applications/accounting: config/ webapp/accounting/invoice/ webapp/ap/WEB-INF/ webapp/ar/WEB-INF/ widget/ap/ widget/ap/forms/ widget/ar/ widget/ar/forms/

Author: apatel
Date: Sat Aug 8 10:21:28 2009
New Revision: 802334

URL: http://svn.apache.org/viewvc?rev=802334&view=rev
Log:
Reorganized AR screens. Thanks Surya, Sumit for working on it. Patch from OFBIZ-2803.

Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml
ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/controller.xml
ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/controller.xml
ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml
ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml
ofbiz/trunk/applications/accounting/widget/ar/ArPaymentScreens.xml
ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
ofbiz/trunk/applications/accounting/widget/ar/InvoiceScreens.xml
ofbiz/trunk/applications/accounting/widget/ar/forms/ArPaymentForms.xml
ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=802334&r1=802333&r2=802334&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Sat Aug 8 10:21:28 2009
@@ -3213,6 +3213,14 @@
<value xml:lang="en">Find AP Payments</value>
<value xml:lang="hi_IN">à¤²à¥à¤à¤¾ à¤¦à¥à¤¯ à¤à¥à¤à¤¤à¤¾à¤¨ à¤à¥à¤à¥à¤</value>
</property>
+ <property key="AccountingFindArInvoices">
+ <value xml:lang="en">Find AR Invoices</value>
+ <value xml:lang="hi_IN">à¤²à¥à¤à¤¾ à¤ªà¥à¤°à¤¾à¤ªà¥à¤¯ à¤à¤¾à¤²à¤¾à¤¨ à¤à¥à¤à¥à¤</value>
+ </property>
+ <property key="AccountingFindArPayments">
+ <value xml:lang="en">Find AR Payments</value>
+ <value xml:lang="hi_IN">à¤²à¥à¤à¤¾ à¤ªà¥à¤°à¤¾à¤ªà¥à¤¯ à¤à¥à¤à¤¤à¤¾à¤¨ à¤à¥à¤à¥à¤</value>
+ </property>
<property key="AccountingFindDepositSlip">
<value xml:lang="en">Find Deposit Slips for finAccount ${finAccountId}</value>
<value xml:lang="hi_IN">à¤µà¤¿à¤¤à¥à¤¤à¥à¤¯ à¤à¤¾à¤¤à¤¾ ${finAccountId} à¤à¥ à¤²à¤¿à¤ à¤à¤®à¤¾ à¤ªà¤°à¥à¤à¥à¤¯à¤¾à¤ à¤¢à¥à¤à¤¢à¥à¤</value>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml?rev=802334&r1=802333&r2=802334&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml Sat Aug 8 10:21:28 2009
@@ -51,7 +51,7 @@
<set field="parameters.sortField" from-field="parameters.sortField" default-value="-invoiceDate"/>
<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="entityName" value="InvoiceAndType"/>
<field-map field-name="orderBy" from-field="parameters.sortField"/>
</service>
</actions>

Modified: ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/controller.xml?rev=802334&r1=802333&r2=802334&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/controller.xml Sat Aug 8 10:21:28 2009
@@ -87,6 +87,10 @@
<response name="success" type="view" value="editPayment"/>
<response name="error" type="view" value="NewOutgoingPayment"/>
</request-map>
+ <request-map uri="newInvoice">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="NewPurchaseInvoice"/>
+ </request-map>


<request-map uri="findVendors">

Modified: ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/controller.xml?rev=802334&r1=802333&r2=802334&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/controller.xml Sat Aug 8 10:21:28 2009
@@ -47,6 +47,39 @@
<response name="success" type="view" value="PaymentGroupOverview"/>
<response name="error" type="view" value="BatchPayments"/>
</request-map>
+ <request-map uri="newPayment">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="NewIncomingPayment"/>
+ </request-map>
+ <request-map uri="createPayment">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createPayment"/>
+ <response name="success" type="view" value="editPayment"/>
+ <response name="error" type="view" value="NewIncomingPayment"/>
+ </request-map>
+ <request-map uri="findInvoices">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="FindArInvoices"/>
+ </request-map>
+ <request-map uri="newInvoice">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="NewSalesInvoice"/>
+ </request-map>
+ <request-map uri="createInvoice">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createInvoice"/>
+ <response name="success" type="request" value="editInvoice"/>
+ <response name="error" type="view" value="NewSalesInvoice"/>
+ </request-map>
+ <request-map uri="FindArInvoices">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="FindArInvoices"/>
+ </request-map>
+ <request-map uri="NewSalesInvoice">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="NewSalesInvoice"/>
+ </request-map>
+



@@ -54,5 +87,9 @@
<view-map name="ListReports" type="screen" page="component://accounting/widget/ar/InvoiceScreens.xml#ListReports"/>
<view-map name="FindPayments" type="screen" page="component://accounting/widget/ar/ArPaymentScreens.xml#FindPayments"/>
<view-map name="BatchPayments" type="screen" page="component://accounting/widget/ar/ArPaymentScreens.xml#BatchPayments"/>
+ <view-map name="NewIncomingPayment" type="screen" page="component://accounting/widget/ar/ArPaymentScreens.xml#NewIncomingPayment"/>
+ <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"/>
+

</site-conf>
\ No newline at end of file

Modified: ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml?rev=802334&r1=802333&r2=802334&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml Sat Aug 8 10:21:28 2009
@@ -46,13 +46,6 @@
<actions>
<set field="titleProperty" value="AccountingFindApInvoices"/>
<set field="tabButtonItem" value="viewInvoices"/>
- <set field="parameters.sortField" from-field="parameters.sortField" default-value="-invoiceDate"/>
- <service service-name="performFind" result-map="invoiceMap">
- <field-map field-name="inputFields" from-field="parameters"/>
- <field-map field-name="entityName" value="InvoiceAndType"/>
- <field-map field-name="orderBy" from-field="parameters.sortField"/>
- </service>
- <set field="invoices" from-field="invoiceMap.listIt"/>
</actions>
<widgets>
<decorator-screen name="CommonApInvoiceDecorator" location="${parameters.CommonApInvoiceDecoratorLocation}">
@@ -69,7 +62,7 @@
<include-form name="FindApInvoices" location="component://accounting/widget/ap/forms/InvoiceForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="ListApInvoices" location="component://accounting/widget/ap/forms/InvoiceForms.xml"/>
+ <include-form name="ListInvoices" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -132,7 +125,7 @@
<screen name="NewPurchaseInvoice">
<section>
<actions>
- <set field="titleProperty" value="AccountingCreateNewInvoice"/>
+ <set field="titleProperty" value="AccountingCreateNewPurchaseInvoice"/>
<set field="headerItem" value="invoices"/>
<entity-one entity-name="Invoice" value-field="invoice"/>
</actions>

Modified: ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml?rev=802334&r1=802333&r2=802334&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml Sat Aug 8 10:21:28 2009
@@ -78,49 +78,6 @@
</field>
</form>

- <form name="ListApInvoices" type="list" separate-columns="true" list-name="invoices" default-entity-name="Invoice"
- odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
- <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" default-value="0" value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)
- .multiply(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceCurrencyConversionRate(delegator,invoiceId))}"/>
- <set field="total" default-value="0" value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(delegator,invoiceId)
- .multiply(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceCurrencyConversionRate(delegator,invoiceId))}"/>
- <set field="currencyUomId" from-field="defaultOrganizationPartyCurrencyUomId"/>
- </row-actions>
-
- <field name="invoiceId" widget-style="buttontext" sort-field="true">
- <hyperlink description="${invoiceId}" target="invoiceOverview">
- <parameter param-name="invoiceId"/>
- </hyperlink>
- </field>
- <field name="invoiceTypeId" sort-field="true"><display-entity entity-name="InvoiceType"/></field>
- <field name="invoiceDate" sort-field="true"><display type="date"/></field>
- <field name="statusId" title="${uiLabelMap.CommonStatus}" sort-field="true"><display-entity entity-name="StatusItem"/></field>
- <field name="description" sort-field="true"><display/></field>
- <field name="partyIdFrom" sort-field="true">
- <hyperlink target="/partymgr/control/PartyFinancialHistory" target-type="inter-app" description="${partyNameResultFrom.fullName} [${partyIdFrom}]">
- <parameter param-name="partyId" from-field="partyIdFrom"/>
- </hyperlink>
- </field>
- <field name="partyIdTo" parameter-name="partyId">
- <hyperlink target="/partymgr/control/PartyFinancialHistory" target-type="inter-app" description="${partyNameResultTo.fullName} [${partyId}]">
- <parameter param-name="partyId"/>
- </hyperlink>
- </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>
-
<form name="FindPurchaseInvoices" type="single" target="FindPurchaseInvoices">
<actions>
<set field="organizationPartyId" from-field="parameters.organizationPartyId" default-value="${defaultOrganizationPartyId}"/>

Modified: ofbiz/trunk/applications/accounting/widget/ar/ArPaymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/ArPaymentScreens.xml?rev=802334&r1=802333&r2=802334&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/ArPaymentScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/ArPaymentScreens.xml Sat Aug 8 10:21:28 2009
@@ -23,7 +23,7 @@
<screen name="FindPayments">
<section>
<actions>
- <set field="titleProperty" value="PageTitleFindPayment"/>
+ <set field="titleProperty" value="AccountingFindArPayments"/>
<set field="headerItem" value="payments"/>
<set field="tabButtonItem" value="findPayments"/>
</actions>
@@ -35,11 +35,11 @@
<decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="menu-bar">
<container style="button-bar">
- <link target="newPayment" text="${uiLabelMap.CommonCreateNew} ${uiLabelMap.AccountingPayment}" style="buttontext"/>
+ <link target="newPayment" text="${uiLabelMap.CommonCreateNew}" style="buttontext"/>
</container>
</decorator-section>
<decorator-section name="search-options">
- <include-form name="FindPayments" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
+ <include-form name="FindArPayments" location="component://accounting/widget/ar/forms/ArPaymentForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
<include-form name="ListPayments" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
@@ -89,4 +89,25 @@
</widgets>
</section>
</screen>
+ <screen name="NewIncomingPayment">
+ <section>
+ <actions>
+ <set field="titleProperty" value="AccountingNewPaymentIncoming"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <screenlet title="${uiLabelMap.AccountingNewPaymentIncoming}">
+ <include-form name="NewPaymentIn" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
+ </screenlet>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
</screens>

Modified: ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml?rev=802334&r1=802333&r2=802334&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml Sat Aug 8 10:21:28 2009
@@ -159,4 +159,23 @@
</widgets>
</section>
</screen>
+ <screen name="CommonArInvoiceDecorator">
+ <section>
+ <actions>
+ <set field="headerItem" value="invoices"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameter.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <decorator-section-include name="body"/>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
</screens>
\ No newline at end of file

Modified: ofbiz/trunk/applications/accounting/widget/ar/InvoiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/InvoiceScreens.xml?rev=802334&r1=802333&r2=802334&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/InvoiceScreens.xml Sat Aug 8 10:21:28 2009
@@ -43,4 +43,56 @@
</section>
</screen>

+ <screen name="FindArInvoices">
+ <section>
+ <actions>
+ <set field="titleProperty" value="AccountingFindArInvoices"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonArInvoiceDecorator" location="component://accounting/widget/ar/CommonScreens.xml">
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="menu-bar">
+ <container style="button-bar">
+ <link target="newInvoice" text="${uiLabelMap.CommonCreateNew}" style="buttontext"/>
+ </container>
+ </decorator-section>
+ <decorator-section name="search-options">
+ <include-form name="FindArInvoices" location="component://accounting/widget/ar/forms/InvoiceForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="ListInvoices" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="NewSalesInvoice">
+ <section>
+ <actions>
+ <set field="titleProperty" value="AccountingCreateNewSalesInvoice"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <screenlet title="${uiLabelMap.AccountingCreateNewSalesInvoice}">
+ <include-form name="NewSalesInvoice" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </screenlet>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
</screens>
\ No newline at end of file

Modified: ofbiz/trunk/applications/accounting/widget/ar/forms/ArPaymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/forms/ArPaymentForms.xml?rev=802334&r1=802333&r2=802334&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/forms/ArPaymentForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/forms/ArPaymentForms.xml Sat Aug 8 10:21:28 2009
@@ -60,4 +60,15 @@
<form name="FindBatchPaymentsForDepositSlip" target="NewDepositSlip" extends="FindBatchPayments" extends-resource="component://accounting/widget/ar/forms/ArPaymentForms.xml">
<field name="finAccountId"><display description="${finAccountId}"/></field>
</form>
+ <form name="FindArPayments" type="single" target="findPayments" extends="FindPayments" extends-resource="component://accounting/webapp/accounting/payment/PaymentForms.xml">
+ <field name="parentTypeId"><hidden value="RECEIPT"/></field>
+ <field name="paymentTypeId" position="1">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="PaymentType" description="${description}">
+ <entity-constraint name="parentTypeId" value="RECEIPT"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ </form>
+
</forms>

Modified: ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml?rev=802334&r1=802333&r2=802334&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml Sat Aug 8 10:21:28 2009
@@ -75,4 +75,16 @@
<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>
+
+ <form name="FindArInvoices" type="single" target="FindArInvoices" extends="FindInvoices" extends-resource="component://accounting/webapp/accounting/invoice/InvoiceForms.xml">
+ <field name="parentTypeId"><hidden value="SALES_INVOICE"/></field>
+ <field name="invoiceTypeId" position="1">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="InvoiceType" description="${description}">
+ <entity-constraint name="parentTypeId" value="SALES_INVOICE"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ </form>
+
</forms>