svn commit: r597976 - in /ofbiz/trunk/applications/acco
Locked
 
|
Author: jacopoc
Date: Sun Nov 25 04:24:58 2007 New Revision: 597976 URL: http://svn.apache.org/viewvc?rev=597976&view=rev Log: Implemented new organization GL setup screen for journals; added field for error journal to the accounting preferences entity (and screens); implemented transaction/entries serches by journal id. Misc cleanups. Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml ofbiz/trunk/applications/accounting/widget/AdminScreens.xml ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml ofbiz/trunk/applications/accounting/widget/Menus.xml Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties?rev=597976&r1=597975&r2=597976&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties (original) +++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties Sun Nov 25 04:24:58 2007 @@ -217,6 +217,7 @@ AccountingGlAccountDefault=GL Account defaults AccountingGlAccountId=GL Account ID AccountingGlAccountTypeDefaults=GL Account Type Defaults +AccountingGlJournals=Journals AccountingInvoiceHeaderDetailedInformation=Header Detailed Information AccountingHideFields=Hide Fields AccountingIgnoreInvoiceItems=Ignore Invoice Items @@ -361,7 +362,7 @@ AccountingPermissionError=You do not have permission for this function. AccountingPleaseSendPaymentTo=Please Send Payment To AccountingPostTransaction=Post Transaction -AccountingPreference=Organization Accounting Preferences +AccountingPreference=Accounting Preferences AccountingPrefixCard=Prefix on Card AccountingPrintAsCheck=Print As Check AccountingPrintChecks=Checks to Print Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?rev=597976&r1=597975&r2=597976&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original) +++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Sun Nov 25 04:24:58 2007 @@ -1484,6 +1484,7 @@ <alias entity-alias="ATR" name="transactionDate"/> <alias entity-alias="ATR" name="postedDate"/> <alias entity-alias="ATR" name="transDescription" field="description"/> + <alias entity-alias="ATR" name="glJournalId"/> <alias entity-alias="ATT" name="transTypeDescription" field="description"/> <alias entity-alias="ATR" name="invoiceId"/> <alias entity-alias="ATR" name="paymentId"/> @@ -1534,6 +1535,9 @@ <relation type="one" fk-name="ATAE_PAYMENT" rel-entity-name="Payment"> <key-map field-name="paymentId"/> </relation> + <relation type="one" fk-name="ATAE_GLJOURNAL" rel-entity-name="GlJournal"> + <key-map field-name="glJournalId"/> + </relation> </view-entity> <view-entity entity-name="AcctgTransEntryProdSums" package-name="org.ofbiz.accounting.ledger" @@ -1947,6 +1951,12 @@ <field name="orderIdPrefix" type="very-short"/> <field name="lastOrderNumber" type="numeric"/> <field name="refundPaymentMethodId" type="id"/> + <field name="errorGlJournalId" type="id"> + <description> + Journal to which all the failed automatic transaction are assigned. + If the error journal is set, if the GL posting fails for some reason the triggering operation (finalizing an invoice or payment or whatever) would NOT roll back, instead the partial GL post would be placed into the error journal. + </description> + </field> <prim-key field="partyId"/> <relation type="one" rel-entity-name="Party" fk-name="ACTG_PREF_PTY"> <key-map field-name="partyId"/> @@ -1971,6 +1981,9 @@ </relation> <relation type="one" rel-entity-name="PaymentMethod"> <key-map field-name="refundPaymentMethodId" rel-field-name="paymentMethodId"/> + </relation> + <relation type="one" fk-name="ACTGPREF_GLJRNL" rel-entity-name="GlJournal"> + <key-map field-name="errorGlJournalId" rel-field-name="glJournalId"/> </relation> </entity> <entity entity-name="ProductAverageCost" 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=597976&r1=597975&r2=597976&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Sun Nov 25 04:24:58 2007 @@ -536,7 +536,27 @@ <security https="true" auth="true"/> <response name="success" type="view" value="ListAcctgTransEntries"/> </request-map> - + + <request-map uri="SetupGlJournals"><security https="true" auth="true"/><response name="success" type="view" value="SetupGlJournals"/></request-map> + <request-map uri="createGlJournal"> + <security https="true" auth="true"/> + <event type="service" invoke="createGlJournal"/> + <response name="success" type="view" value="SetupGlJournals"/> + <response name="error" type="view" value="SetupGlJournals"/> + </request-map> + <request-map uri="updateGlJournal"> + <security https="true" auth="true"/> + <event type="service" invoke="updateGlJournal"/> + <response name="success" type="view" value="SetupGlJournals"/> + <response name="error" type="view" value="SetupGlJournals"/> + </request-map> + <request-map uri="deleteGlJournal"> + <security https="true" auth="true"/> + <event type="service" invoke="deleteGlJournal"/> + <response name="success" type="view" value="SetupGlJournals"/> + <response name="error" type="view" value="SetupGlJournals"/> + </request-map> + <!-- =============== Fixed Asset mapping =================--> <request-map uri="ListFixedAssets"><security https="true" auth="true"/><response name="success" type="view" value="ListFixedAssets"/></request-map> <request-map uri="EditFixedAsset"><security https="true" auth="true"/><response name="success" type="view" value="EditFixedAsset"/></request-map> @@ -1545,10 +1565,11 @@ <view-map name="EditTaxAuthorityPartyInfo" type="screen" page="component://accounting/widget/TaxAuthorityScreens.xml#EditTaxAuthorityPartyInfo"/> <!-- administrative pages --> - <view-map name="ListGlAccountOrganization" type="screen" page="component://accounting/widget/AdminScreens.xml#ListGlAccountOrganization"/> <view-map name="ListCompanies" type="screen" page="component://accounting/widget/AdminScreens.xml#ListCompanies"/> <view-map name="TimePeriods" type="screen" page="component://accounting/widget/AdminScreens.xml#TimePeriods"/> <view-map name="PartyAcctgPreference" type="screen" page="component://accounting/widget/AdminScreens.xml#PartyAcctgPreference"/> + <view-map name="ListGlAccountOrganization" type="screen" page="component://accounting/widget/AdminScreens.xml#ListGlAccountOrganization"/> + <view-map name="SetupGlJournals" type="screen" page="component://accounting/widget/AdminScreens.xml#SetupGlJournals"/> <view-map name="ViewFXConversions" type="screen" page="component://accounting/widget/AdminScreens.xml#ViewFXConversions"/> <view-map name="GlAccountTypeDefaults" type="screen" page="component://accounting/widget/AdminScreens.xml#GlAccountTypeDefaults"/> <view-map name="GlAccountPurInvoice" type="screen" page="component://accounting/widget/AdminScreens.xml#GlAccountPurInvoice"/> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml?rev=597976&r1=597975&r2=597976&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml Sun Nov 25 04:24:58 2007 @@ -188,6 +188,14 @@ </entity-options> </drop-down> </field> + <field name="errorGlJournalId"> + <drop-down allow-empty="true"> + <entity-options entity-name="GlJournal" key-field-name="glJournalId" description="${glJournalName} [${glJournalId}]"> + <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/> + <entity-order-by field-name="glJournalName"/> + </entity-options> + </drop-down> + </field> </form> <!-- forms for managing FX rates --> @@ -454,32 +462,27 @@ <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit/></field> </form> - <form name="ListChecksToPrint" type="multi" list-name="payments" target="printChecks" separate-columns="true"> - <field name="paymentId"> - <hyperlink target="paymentOverview?paymentId=${paymentId}" description="${paymentId}"/> - </field> - <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}"> - <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView" key-field-name="partyId"/> - </field> - <field name="amount" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field> - <field name="effectiveDate"><display/></field> - <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><check/></field> - <field name="submitButton" title="${uiLabelMap.CommonPrint}" widget-style="smallSubmit"> - <submit/> - </field> - </form> - <form name="ListChecksToSend" type="multi" use-row-submit="true" list-name="payments" target="quickSendPayment?organizationPartyId=${organizationPartyId}" separate-columns="true"> - <field name="paymentId"><hidden/></field> - <field name="paymentId"> - <hyperlink target="paymentOverview?paymentId=${paymentId}" description="${paymentId}"/> - </field> - <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}"> - <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView" key-field-name="partyId"/> - </field> - <field name="amount" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field> - <field name="effectiveDate"><display/></field> - <field name="paymentRefNum"><text/></field> - <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><check/></field> - <field name="submitButton" title="${uiLabelMap.CommonSend}" widget-style="smallSubmit"><submit/></field> + <form name="EditGlJournal" type="single" target="createGlJournal" title="" default-map-name="glJournal"> + <alt-target use-when="glJournal!=null" target="updateGlJournal"/> + <auto-fields-service service-name="createGlJournal"/> + <field name="organizationPartyId"><hidden/></field> + <field name="glJournalId" use-when="glJournal!=null"><display/></field> + <field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field> + </form> + <form name="ListGlJournals" type="list"> + <actions> + <entity-condition entity-name="GlJournal"> + <condition-expr field-name="organizationPartyId" operator="equals" env-name="organizationPartyId"/> + <order-by field-name="glJournalId"/> + </entity-condition> + </actions> + <auto-fields-entity entity-name="GlJournal" default-field-type="display"/> + <field name="organizationPartyId"><hidden/></field> + <field name="glJournalId" widget-style="buttontext"> + <hyperlink target="SetupGlJournals?organizationPartyId=${organizationPartyId}&glJournalId=${glJournalId}" description="${glJournalId}"/> + </field> + <field name="remove" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> + <hyperlink target="deleteGlJournal?organizationPartyId=${organizationPartyId}&glJournalId=${glJournalId}" description="${uiLabelMap.CommonRemove}"/> + </field> </form> </forms> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml?rev=597976&r1=597975&r2=597976&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml Sun Nov 25 04:24:58 2007 @@ -399,4 +399,33 @@ <auto-fields-entity entity-name="AcctgTransAndEntries" default-field-type="display"/> <field name="paymentId"><hidden/></field> </form> + + <form name="ListChecksToPrint" type="multi" list-name="payments" target="printChecks" separate-columns="true"> + <field name="paymentId"> + <hyperlink target="paymentOverview?paymentId=${paymentId}" description="${paymentId}"/> + </field> + <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}"> + <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView" key-field-name="partyId"/> + </field> + <field name="amount" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field> + <field name="effectiveDate"><display/></field> + <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><check/></field> + <field name="submitButton" title="${uiLabelMap.CommonPrint}" widget-style="smallSubmit"> + <submit/> + </field> + </form> + <form name="ListChecksToSend" type="multi" use-row-submit="true" list-name="payments" target="quickSendPayment?organizationPartyId=${organizationPartyId}" separate-columns="true"> + <field name="paymentId"><hidden/></field> + <field name="paymentId"> + <hyperlink target="paymentOverview?paymentId=${paymentId}" description="${paymentId}"/> + </field> + <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}"> + <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView" key-field-name="partyId"/> + </field> + <field name="amount" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field> + <field name="effectiveDate"><display/></field> + <field name="paymentRefNum"><text/></field> + <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><check/></field> + <field name="submitButton" title="${uiLabelMap.CommonSend}" widget-style="smallSubmit"><submit/></field> + </form> </forms> Modified: ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml?rev=597976&r1=597975&r2=597976&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml Sun Nov 25 04:24:58 2007 @@ -562,7 +562,7 @@ <section> <condition><if-has-permission permission="ACCOUNTING" action="_PRINT_CHECKS"/></condition> <widgets> - <include-form name="ListChecksToPrint" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/> + <include-form name="ListChecksToPrint" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> </widgets> <fail-widgets> <label style="head3">${uiLabelMap.AccountingPrintChecksPermissionError}</label> @@ -602,7 +602,7 @@ <section> <condition><if-has-permission permission="PAY_INFO" action="_UPDATE"/></condition> <widgets> - <include-form name="ListChecksToSend" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/> + <include-form name="ListChecksToSend" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> </widgets> <fail-widgets> <label style="head3">${uiLabelMap.AccountingUpdatePaymentPermissionError}</label> Modified: ofbiz/trunk/applications/accounting/widget/AdminScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AdminScreens.xml?rev=597976&r1=597975&r2=597976&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/AdminScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/AdminScreens.xml Sun Nov 25 04:24:58 2007 @@ -65,7 +65,7 @@ <screen name="TimePeriods"> <section> - <actions> + <actions> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <set field="titleProperty" value="TimePeriod"/> <set field="labelTitleProperty" value="${uiLabelMap.TimePeriod}"/> @@ -105,7 +105,7 @@ <screen name="PartyAcctgPreference"> <section> - <actions> + <actions> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <set field="titleProperty" value="AccountingPreference"/> <set field="labelTitleProperty" value="${uiLabelMap.AccountingPreference}"/> @@ -148,6 +148,26 @@ <include-form name="ListConversions" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/> <label style="head1">${uiLabelMap.AccountingUpdateFX}</label> <include-form name="updateFXConversion" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="SetupGlJournals"> + <section> + <actions> + <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> + <set field="titleProperty" value="AccountingGlJournals"/> + <set field="labelTitleProperty" value="${uiLabelMap.AccountingGlJournals}"/> + <set field="tabButtonItem" value="SetupGlJournals"/> + <set field="organizationPartyId" from-field="parameters.organizationPartyId"/> + <entity-one entity-name="GlJournal" value-name="glJournal"/> + </actions> + <widgets> + <decorator-screen name="CommonAdminDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <include-form name="ListGlJournals" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/> + <include-form name="EditGlJournal" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml?rev=597976&r1=597975&r2=597976&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml Sun Nov 25 04:24:58 2007 @@ -37,6 +37,14 @@ </entity-options> </drop-down> </field> + <field name="glJournalId"> + <drop-down allow-empty="true"> + <entity-options entity-name="GlJournal" description="${glJournalName} [${glJournalId}]"> + <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/> + <entity-order-by field-name="glJournalName"/> + </entity-options> + </drop-down> + </field> <field name="isPosted"> <drop-down allow-empty="true"> <option description="${uiLabelMap.CommonNo}" key="N"/> @@ -63,6 +71,7 @@ <condition-expr field-name="organizationPartyId" operator="equals" env-name="organizationPartyId"/> <condition-expr field-name="acctgTransTypeId" operator="equals" env-name="parameters.acctgTransTypeId" ignore-if-empty="true"/> <condition-expr field-name="glFiscalTypeId" operator="equals" env-name="parameters.glFiscalTypeId" ignore-if-empty="true"/> + <condition-expr field-name="glJournalId" operator="equals" env-name="parameters.glJournalId" ignore-if-empty="true"/> <condition-expr field-name="isPosted" operator="equals" env-name="parameters.isPosted" ignore-if-empty="true"/> <condition-expr field-name="partyId" operator="equals" env-name="parameters.partyId" ignore-if-empty="true"/> <condition-expr field-name="invoiceId" operator="equals" env-name="parameters.invoiceId" ignore-if-empty="true"/> @@ -160,6 +169,14 @@ </entity-options> </drop-down> </field> + <field name="glJournalId"> + <drop-down allow-empty="true"> + <entity-options entity-name="GlJournal" description="${glJournalName} [${glJournalId}]"> + <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/> + <entity-order-by field-name="glJournalName"/> + </entity-options> + </drop-down> + </field> <field name="isPosted"> <drop-down allow-empty="true"> <option description="${uiLabelMap.CommonNo}" key="N"/> @@ -186,6 +203,7 @@ <condition-expr field-name="glAccountId" operator="equals" env-name="parameters.glAccountId" ignore-if-empty="true"/> <condition-expr field-name="acctgTransTypeId" operator="equals" env-name="parameters.acctgTransTypeId" ignore-if-empty="true"/> <condition-expr field-name="glFiscalTypeId" operator="equals" env-name="parameters.glFiscalTypeId" ignore-if-empty="true"/> + <condition-expr field-name="glJournalId" operator="equals" env-name="parameters.glJournalId" ignore-if-empty="true"/> <condition-expr field-name="isPosted" operator="equals" env-name="parameters.isPosted" ignore-if-empty="true"/> <condition-expr field-name="partyId" operator="equals" env-name="parameters.partyId" ignore-if-empty="true"/> <condition-expr field-name="invoiceId" operator="equals" env-name="parameters.invoiceId" ignore-if-empty="true"/> Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=597976&r1=597975&r2=597976&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/Menus.xml (original) +++ ofbiz/trunk/applications/accounting/widget/Menus.xml Sun Nov 25 04:24:58 2007 @@ -436,6 +436,9 @@ <menu-item name="ListGlAccountOrganization" title="${uiLabelMap.AccountingChartOfAcctsMenu}"> <link target="ListGlAccountOrganization?organizationPartyId=${organizationPartyId}"/> </menu-item> + <menu-item name="SetupGlJournals" title="${uiLabelMap.AccountingGlJournals}"> + <link target="SetupGlJournals?organizationPartyId=${organizationPartyId}"/> + </menu-item> <menu-item name="GlAccountAssignment" title="${uiLabelMap.AccountingGlAccountDefault}"> <link target="GlAccountAssignment?organizationPartyId=${organizationPartyId}"/> </menu-item> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |