svn commit: r835287 - in /ofbiz/trunk/applications/acco
Locked
 
|
Author: apatel
Date: Thu Nov 12 07:53:09 2009 New Revision: 835287 URL: http://svn.apache.org/viewvc?rev=835287&view=rev Log: Adding Find Bank Reconciliations screen. Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=835287&r1=835286&r2=835287&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original) +++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Thu Nov 12 07:53:09 2009 @@ -2263,6 +2263,9 @@ <value xml:lang="en">Create New Financial Account</value> <value xml:lang="hi_IN">नया वितà¥à¤¤à¥à¤¯ à¤à¤¾à¤¤à¤¾ बनाà¤à¤</value> </property> + <property key="AccountingCreateNewFinAccountReconciliations"> + <value xml:lang="en">Create New Financial Account Reconciliations</value> + </property> <property key="AccountingCreateNewGiftCard"> <value xml:lang="de">Neuen Gutschein erstellen</value> <value xml:lang="en">Create New Gift Card</value> @@ -3324,6 +3327,12 @@ <value xml:lang="en">Find Deposit Slips for Financial Account : ${finAccount.finAccountName} [${finAccountId}]</value> <value xml:lang="hi_IN">वितà¥à¤¤à¥à¤¯ à¤à¤¾à¤¤à¤¾ ${finAccount.finAccountName} [${finAccountId}] à¤à¥ लिठà¤à¤®à¤¾ परà¥à¤à¥à¤¯à¤¾à¤ ढà¥à¤à¤¢à¥à¤</value> </property> + <property key="AccountingFindFinAccountReconciliations"> + <value xml:lang="en">Find Financial Account Reconciliations</value> + </property> + <property key="AccountingAddFinAccountReconciliations"> + <value xml:lang="en">Add Financial Account Reconciliations for Financial Account : ${finAccount.finAccountName} [${finAccountId}]</value> + </property> <property key="AccountingFindFixedAssets"> <value xml:lang="de">Suche Anlagen</value> <value xml:lang="en">Find Fixed Assets</value> @@ -13038,6 +13047,9 @@ <value xml:lang="en">Find Transactions for Financial Account: ${finAccount.finAccountName} [${finAccountId}]</value> <value xml:lang="hi_IN">${finAccount.finAccountName} [${finAccountId}] वितà¥à¤¤à¥à¤¯ à¤à¤¾à¤¤à¥ à¤à¥ लिठवितà¥à¤¤à¥à¤¯ à¤à¤¾à¤¤à¤¾ à¤à¤¤à¤¿à¤µà¤¿à¤§à¤¿à¤¯à¤¾à¤ à¤à¥à¤à¥à¤</value> </property> + <property key="PageTitleFindFinAccountReconciliations"> + <value xml:lang="en">Find Financial Account Reconciliations for Financial Account : ${finAccount.finAccountName} [${finAccountId}]</value> + </property> <property key="PageTitleFindPaymentGatewayConfig"> <value xml:lang="en">Find Payment Gateway Config</value> <value xml:lang="hi_IN">à¤à¥à¤à¤¤à¤¾à¤¨ à¤à¥à¤à¤µà¥ विनà¥à¤¯à¤¾à¤¸ à¤à¥à¤à¥à¤</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=835287&r1=835286&r2=835287&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 12 07:53:09 2009 @@ -1952,6 +1952,10 @@ <security https="true" auth="true"/> <response name="success" type="view" value="EditFinAccountReconciliations"/> </request-map> + <request-map uri="FindFinAccountReconciliations"> + <security https="true" auth="true"/> + <response name="success" type="view" value="FindFinAccountReconciliations"/> + </request-map> <request-map uri="createGlReconciliation"> <security https="true" auth="true"/> <event type="service" invoke="createGlReconciliation"/> @@ -2556,6 +2560,7 @@ <view-map name="BankReconciliation" type="screen" page="component://accounting/widget/FinAccountScreens.xml#BankReconciliation"/> <view-map name="EditFinAccountReconciliations" type="screen" page="component://accounting/widget/FinAccountScreens.xml#EditFinAccountReconciliations"/> <view-map name="ViewGlReconciliationWithTransaction" type="screen" page="component://accounting/widget/FinAccountScreens.xml#ViewGlReconciliationWithTransaction"/> + <view-map name="FindFinAccountReconciliations" type="screen" page="component://accounting/widget/FinAccountScreens.xml#FindFinAccountReconciliations"/> <!-- FixedAsset --> <view-map name="ListFixedAssets" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#ListFixedAssets"/> Modified: ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml?rev=835287&r1=835286&r2=835287&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml (original) +++ ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml Thu Nov 12 07:53:09 2009 @@ -1189,8 +1189,8 @@ <parameter param-name="organizationPartyId" from-field="finAccount.ownerPartyId"/> </link> </menu-item> - <menu-item name="EditFinAccountReconciliations" title="${uiLabelMap.AccountingReconciliation}"> - <link target="EditFinAccountReconciliations"> + <menu-item name="FindFinAccountReconciliations" title="${uiLabelMap.AccountingReconciliation}"> + <link target="FindFinAccountReconciliations"> <parameter param-name="finAccountId"/> </link> </menu-item> @@ -1222,5 +1222,29 @@ <link target="FindFinAccount"/> </menu-item> </menu> - + <menu name="FinAccountReconciliationsTabBar" menu-container-style="button-bar button-style-2" > + <menu-item name="Find" title="${uiLabelMap.AccountingFindFinAccountReconciliations}"> + <condition> + <and> + <not><if-empty field="finAccountId"/></not> + <not><if-empty field="glReconciliationId"/></not> + <if-compare field="tabButtonItem2" operator="not-equals" value="Find"/> + </and> + </condition> + <link target="FindFinAccountReconciliations"> + <parameter param-name="finAccountId"/> + </link> + </menu-item> + <menu-item name="NewFinAccountReconciliations" title="${uiLabelMap.AccountingCreateNewFinAccountReconciliations}"> + <condition> + <or> + <not><if-empty field="glReconciliationId"/></not> + <if-compare field="tabButtonItem2" operator="equals" value="Find"/> + </or> + </condition> + <link target="EditFinAccountReconciliations"> + <parameter param-name="finAccountId"/> + </link> + </menu-item> + </menu> </menus> Modified: ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml?rev=835287&r1=835286&r2=835287&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml Thu Nov 12 07:53:09 2009 @@ -433,4 +433,19 @@ <field name="reconciledBalance"><display type="currency" currency="${currencyUomId}"></display></field> <field name="openingBalance"><display type="currency" currency="${currencyUomId}"></display></field> </form> + <form name="FindBankReconciliation" type="single" target="FindFinAccountReconciliations"> + <field name="finAccountId"><hidden value="${parameters.finAccountId}"/></field> + <field name="glReconciliationId"><text/></field> + <field name="glReconciliationName"><text/></field> + <field name="statusId" title="${uiLabelMap.CommonStatus}"> + <drop-down allow-empty="true"> + <entity-options description="${description}" entity-name="StatusItem"> + <entity-constraint name="statusTypeId" operator="equals" value="GLREC_STATUS"/> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="organizationPartyId"><text/></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=835287&r1=835286&r2=835287&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml Thu Nov 12 07:53:09 2009 @@ -574,24 +574,31 @@ <section> <actions> <set field="titleProperty" value="AccountingEditFinAccountReconciliations"/> - <set field="tabButtonItem" value="EditFinAccountReconciliations"/> + <set field="tabButtonItem" value="FindFinAccountReconciliations"/> <set field="finAccountId" from-field="parameters.finAccountId"/> <set field="glReconciliationId" from-field="parameters.glReconciliationId" default-value=""/> - <entity-one entity-name="FinAccount" value-field="finAccount"/> - <entity-and entity-name="GlReconciliation" list="glReconciliations"> - <field-map field-name="glAccountId" from-field="finAccount.postToGlAccountId"/> - <order-by field-name="reconciledDate DESC"/> - </entity-and> + <set field="tabButtonItem2" value="${groovy:glReconciliationId==null?'NewFinAccountReconciliations':'EditFinAccountReconciliations'}"/> <entity-one entity-name="FinAccount" value-field="finAccount"/> </actions> <widgets> <decorator-screen name="CommonFinAccountDecorator" location="${parameters.finAccountDecoratorLocation}"> <decorator-section name="body"> - <label style="h1" text="${uiLabelMap.AccountingEditFinAccountReconciliations}"/> - <screenlet id="FinAccountReconciliationPanel" collapsible="true"> - <include-form name="EditFinAccountReconciliation" location="component://accounting/widget/FinAccountForms.xml"/> - </screenlet> - <include-form name="ListFinAccountReconciliations" location="component://accounting/widget/FinAccountForms.xml"/> + <include-menu name="FinAccountReconciliationsTabBar" location="component://accounting/widget/AccountingMenus.xml"/> + <section> + <condition> + <if-empty field="glReconciliationId"/> + </condition> + <widgets> + <screenlet id="AddFinAccountReconciliation" title="${uiLabelMap.AccountingAddFinAccountReconciliations}"> + <include-form name="EditFinAccountReconciliation" location="component://accounting/widget/FinAccountForms.xml"/> + </screenlet> + </widgets> + <fail-widgets> + <screenlet id="EditFinAccountReconciliation" title="${uiLabelMap.AccountingEditFinAccountReconciliations}"> + <include-form name="EditFinAccountReconciliation" location="component://accounting/widget/FinAccountForms.xml"/> + </screenlet> + </fail-widgets> + </section> </decorator-section> </decorator-screen> </widgets> @@ -639,4 +646,41 @@ </widgets> </section> </screen> + <screen name="FindFinAccountReconciliations"> + <section> + <actions> + <set field="tabButtonItem" value="FindFinAccountReconciliations"/> + <set field="titleProperty" value="PageTitleFindFinAccountReconciliations"/> + <set field="tabButtonItem2" value="Find"/> + <set field="finAccountId" from-field="parameters.finAccountId"/> + <set field="glReconciliationId" from-field="parameters.glReconciliationId" default-value=""/> + <entity-one entity-name="FinAccount" value-field="finAccount"/> + <entity-condition entity-name="GlReconciliation" list="glReconciliations"> + <condition-list> + <condition-expr field-name="glAccountId" operator="equals" from-field="finAccount.postToGlAccountId"/> + <condition-expr field-name="glReconciliationId" operator="equals" from-field="parameters.glReconciliationId" ignore-if-empty="true"/> + <condition-expr field-name="glReconciliationName" operator="equals" from-field="parameters.glReconciliationName" ignore-if-empty="true"/> + <condition-expr field-name="description" operator="equals" from-field="parameters.description" ignore-if-empty="true"/> + <condition-expr field-name="statusId" operator="equals" from-field="parameters.statusId" ignore-if-empty="true"/> + <condition-expr field-name="organizationPartyId" operator="equals" from-field="parameters.organizationPartyId" ignore-if-empty="true"/> + </condition-list> + </entity-condition> + </actions> + <widgets> + <decorator-screen name="CommonFinAccountDecorator" location="${parameters.finAccountDecoratorLocation}"> + <decorator-section name="body"> + <include-menu name="FinAccountReconciliationsTabBar" location="component://accounting/widget/AccountingMenus.xml"/> + <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="search-options"> + <include-form name="FindBankReconciliation" location="component://accounting/widget/FinAccountForms.xml"/> + </decorator-section> + <decorator-section name="search-results"> + <include-form name="ListFinAccountReconciliations" location="component://accounting/widget/FinAccountForms.xml"/> + </decorator-section> + </decorator-screen> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> </screens> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |