svn commit: r884402 - in /ofbiz/trunk/applications/acco
Locked
svn commit: r884402 - in /ofbiz/trunk/applications/acco
 
|
Author: ashish
Date: Thu Nov 26 05:30:53 2009 New Revision: 884402 URL: http://svn.apache.org/viewvc?rev=884402&view=rev Log: This patch contain following improvement : - 1) Added Lookup for "Gl Reconciliation Id" 2) Added Lookup for "Organization Party Id" 3) Added check to show ReconciledBalance only when GlReconciliation balance is "GLREC_RECONCILED" 4) Added field glAccountId in search criteria . 5) On screen "ViewGlReconciliationWithTransaction" Reconciliation Menu bar should come selected . Thanks Awdesh for the contribution. Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml ofbiz/trunk/applications/accounting/widget/LookupScreens.xml Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=884402&r1=884401&r2=884402&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original) +++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Thu Nov 26 05:30:53 2009 @@ -5572,6 +5572,9 @@ <value xml:lang="nl">Vind onderdelen overeenkomst</value> <value xml:lang="zh">æ¥æ¾ååæ¡æ¬¾</value> </property> + <property key="AccountingLookupGlReconciliations"> + <value xml:lang="en">Lookup Gl Reconciliations</value> + </property> <property key="AccountingLookupInvoices"> <value xml:lang="ar">إطÙاÙØ© عÙ٠اÙÙÙاتÙر</value> <value xml:lang="de">Rechnungen suchen</value> 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=884402&r1=884401&r2=884402&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Thu Nov 26 05:30:53 2009 @@ -2178,6 +2178,7 @@ <request-map uri="LookupAgreement"><security https="true" auth="true"/><response name="success" type="view" value="LookupAgreement"/></request-map> <request-map uri="LookupAgreementItem"><security auth="true" https="true"/><response name="success" type="view" value="LookupAgreementItem"/></request-map> <request-map uri="LookupPaymentGroupMember"><security auth="true" https="true"/><response name="success" type="view" value="LookupPaymentGroupMember"/></request-map> + <request-map uri="LookupGlReconciliation"><security auth="true" https="true"/><response name="success" type="view" value="LookupGlReconciliation"/></request-map> <request-map uri="viewprofile"><security https="true" auth="true"/><response name="success" type="view" value="viewprofile"/></request-map> @@ -2713,6 +2714,7 @@ <view-map name="LookupAgreement" type="screen" page="component://accounting/widget/LookupScreens.xml#LookupAgreement"/> <view-map name="LookupAgreementItem" type="screen" page="component://accounting/widget/LookupScreens.xml#LookupAgreementItem"/> <view-map name="LookupPaymentGroupMember" type="screen" page="component://accounting/widget/LookupScreens.xml#LookupPaymentGroupMember"/> + <view-map name="LookupGlReconciliation" type="screen" page="component://accounting/widget/LookupScreens.xml#LookupGlReconciliation"/> <!-- PDFs --> <view-map name="InvoicePDF" type="screenfop" page="component://accounting/widget/AccountingPrintScreens.xml#InvoicePDF" content-type="application/pdf" encoding="none"/> Modified: ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml?rev=884402&r1=884401&r2=884402&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml Thu Nov 26 05:30:53 2009 @@ -281,4 +281,31 @@ <field name="sequenceNum"><display/></field> </form> + <form name="LookupGlReconciliation" target="LookupGlReconciliation" type="single" + header-row-style="header-row" default-table-style="basic-table"> + <field name="glReconciliationId" title="${uiLabelMap.FormFieldTitle_glReconciliationId}"><text-find/></field> + <field name="glReconciliationName" title="${uiLabelMap.FormFieldTitle_glReconciliationName}"><text-find/></field> + <field name="organizationPartyId" title="${uiLabelMap.FormFieldTitle_organizationPartyId}"><lookup target-form-name="LookupPartyName"/></field> + <field name="description" title="${uiLabelMap.CommonDescription}"><text-find/></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.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> + </form> + + <form name="ListLookupReconciliation" list-name="listIt" type="list" target="LookupGlReconciliation" + 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="GlReconciliation"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> + </service> + </actions> + <field name="glReconciliationId" widget-style="buttontext"> + <hyperlink also-hidden="false" target-type="plain" description="${glReconciliationId}" target="javascript:set_value('${glReconciliationId}')"/> + </field> + <field name="glReconciliationName"><display/></field> + <field name="organizationPartyId"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${firstName} ${lastName}[${partyId}]"/></field> + <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field> + </form> </forms> Modified: ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml?rev=884402&r1=884401&r2=884402&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml Thu Nov 26 05:30:53 2009 @@ -403,6 +403,8 @@ <field name="glReconciliationId" use-when="glReconciliationId != null"><display/></field> <field name="glAccountId"><hidden value="${finAccount.postToGlAccountId}"/></field> <field name="organizationPartyId"><lookup target-form-name="LookupPartyName"/></field> + <field name="reconciledBalance" use-when="${reconciledBalance == null}"><hidden/></field> + <field name="reconciledBalance" use-when=""GLREC_RECONCILED".equals("${glReconciliation.statusId}")"><display type="currency" currency="${defaultOrganizationPartyCurrencyUomId}"/></field> <field name="createButton" use-when="glReconciliationId == null" widget-style="smallSubmit"> <submit button-type="button"/> </field> @@ -442,7 +444,7 @@ </form> <form name="FindBankReconciliation" type="single" target="FindFinAccountReconciliations"> <field name="finAccountId"><hidden value="${parameters.finAccountId}"/></field> - <field name="glReconciliationId"><text/></field> + <field name="glReconciliationId"><lookup target-form-name="LookupGlReconciliation"/></field> <field name="glReconciliationName"><text/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"> <drop-down allow-empty="true"> @@ -452,7 +454,8 @@ </entity-options> </drop-down> </field> - <field name="organizationPartyId"><text/></field> + <field name="organizationPartyId"><lookup target-form-name="LookupPartyName"/></field> + <field name="glAccountId"><lookup target-form-name="LookupGlAccount"/></field> <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field> </form> </forms> Modified: ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml?rev=884402&r1=884401&r2=884402&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml Thu Nov 26 05:30:53 2009 @@ -614,10 +614,10 @@ <screen name="ViewGlReconciliationWithTransaction"> <section> <actions> + <set field="tabButtonItem" value="FindFinAccountReconciliations"/> <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/popup.js" global="true"/> <set field="layoutSettings.styleSheets[+0]" value="/images/prototypejs/popup.css" global="true"/> <set field="titleProperty" value="AccountingEditFinAccountReconciliations"/> - <set field="tabButtonItem" value="EditFinAccountReconciliations"/> <set field="finAccountId" from-field="parameters.finAccountId"/> <set field="glReconciliationId" from-field="parameters.glReconciliationId"/> <entity-one entity-name="FinAccount" value-field="finAccount"/> Modified: ofbiz/trunk/applications/accounting/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/LookupScreens.xml?rev=884402&r1=884401&r2=884402&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/LookupScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/LookupScreens.xml Thu Nov 26 05:30:53 2009 @@ -227,4 +227,29 @@ </section> </screen> + <screen name="LookupGlReconciliation"> + <section> + <condition> + <or> + <if-has-permission permission="ACCOUNTING" action="_VIEW"/> + </or> + </condition> + <actions> + <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> + <set field="title" value="${uiLabelMap.AccountingLookupGlReconciliations}"/> + <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="LookupGlReconciliation" location="component://accounting/widget/FieldLookupForms.xml"/> + </decorator-section> + <decorator-section name="search-results"> + <include-form name="ListLookupReconciliation" location="component://accounting/widget/FieldLookupForms.xml"/> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> </screens> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |