svn commit: r598639 - in /ofbiz/trunk/applications/accounting: config/ script/org/ofbiz/accounting/ledger/ servicedef/ webapp/accounting/WEB-INF/ widget/

[jacopoc]

Author: jacopoc
Date: Tue Nov 27 05:37:06 2007
New Revision: 598639

URL: http://svn.apache.org/viewvc?rev=598639&view=rev
Log:
Misc cleanups.

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
    ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
    ofbiz/trunk/applications/accounting/widget/GlForms.xml
    ofbiz/trunk/applications/accounting/widget/GlScreens.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties?rev=598639&r1=598638&r2=598639&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties Tue Nov 27 05:37:06 2007
@@ -38,8 +38,8 @@
 AcctgGlJrnlDescLabel=Description :
 AcctgGlJrnlIdLabel=GL Journal ID :
 AcctgGlJrnlIdToolTip=Non-editable System ID
-AccountingCreateSalesJournalEntry=Create Sales Journal Entry
-AccountingCreatePaymentJournalEntry=Create Payment Journal Entry
+AccountingCreateSalesAcctgTrans=Create Sales Accounting Transaction
+AccountingCreatePaymentAcctgTrans=Create Payment Accounting Transaction
 
 ListAccounts=List Gl Accounts
 
@@ -124,6 +124,7 @@
 AccountingCompanySubtitle=Part of the Open For Business Family of Open Source Software
 AccountingCopyAgreement=Copy Agreement
 AccountingCouldNotFindGlAccount=Could not find GlAccount with ID
+AccountingCreateAcctgTransAndEntries=Quick Create an Accounting Transaction
 AccountingCreateAssignment=Create Assignment
 AccountingCreateBillingAccount=Create Billing Account
 AccountingCreateBillingAccountPermissionError=Security Error: to run createBillingAccount you must have the ACCOUNTING_CREATE or ACCOUNTING_ADMIN permission <br>

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml?rev=598639&r1=598638&r2=598639&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml Tue Nov 27 05:37:06 2007
@@ -92,7 +92,7 @@
     </simple-method>
 
     <!-- ========= GlJournal methods ========= -->
-    <simple-method method-name="createGlJournalEntry" short-description="Creates an AcctgTrans and two offsetting AcctgTransEntry records">
+    <simple-method method-name="quickCreateAcctgTransAndEntries" short-description="Creates an AcctgTrans and two offsetting AcctgTransEntry records">
         <!-- TODO: Do we need to create a GlJournal record here? -->
     
         <!-- first, create the AcctgTrans -->
@@ -340,10 +340,6 @@
                     </if-compare-field>
                 </if-not-empty>
             </if-empty>
-            <if-empty field-name="acctgTransEntry.amount">
-                <add-error><fail-message message="Cannot process accounting transaction entries with null amount: ${acctgTransEntry}"/></add-error>
-                <check-errors/>
-            </if-empty>
             <!-- if the glAccountId is empty, but we have a glAccountTypeId, then we will determine the
                  correct glAccountId from the gl setup settings -->
             <if-empty field-name="acctgTransEntry.glAccountId">
@@ -361,10 +357,13 @@
                     </if-not-empty>
                 </if-not-empty>
             </if-empty>
+            <if-empty field-name="acctgTransEntry.amount">
+                <add-error><fail-message message="Cannot process accounting transaction entries with null amount: ${acctgTransEntry}"/></add-error>
+            </if-empty>
             <if-empty field-name="acctgTransEntry.glAccountId">
-                <add-error><fail-message message="Cannot process accounting transaction entries with a null glAccountId: ${acctgTransEntry}"/></add-error>
-                <check-errors/>
+                <add-error><fail-message message="Mapping not configured for the account type ${acctgTransEntry.glAccountTypeId}; cannot process accounting transaction entries with a null glAccountId."/></add-error>
             </if-empty>
+            <check-errors/>
             <!-- add up debits and credits -->
             <if-compare field-name="acctgTransEntry.debitCreditFlag" operator="equals" value="D">
                 <calculate field-name="debitTotal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}">
@@ -469,7 +468,7 @@
 
     <!-- Services for the automatic creation of accounting transactions based on business transactions
          Typically, these services are triggered by SECAs -->
-    <simple-method method-name="createAcctgTransForSalesShipment" short-description="Create accounting transactions for issuances for a sales shipment (D: Inventory, C: COGS)">
+    <simple-method method-name="createAcctgTransForSalesShipment" short-description="Create accounting transactions for issuances for a sales shipment (D: INVENTORY_ACCOUNT, C: COGS_ACCOUNT)">
         <!-- retrieve ledger rounding properties -->
         <property-to-field resource="arithmetic" property="ledger.decimals" field-name="ledgerDecimals"/>
         <property-to-field resource="arithmetic" property="ledger.rounding" field-name="roundingMode"/>

Modified: ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml?rev=598639&r1=598638&r2=598639&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml (original)
+++ ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml Tue Nov 27 05:37:06 2007
@@ -68,9 +68,9 @@
     </service>
 
     <!-- GlJournal -->
-    <service name="createGlJournalEntry" engine="simple"
-            location="org/ofbiz/accounting/ledger/GeneralLedgerServices.xml" invoke="createGlJournalEntry" auth="true">
-        <description>Calls three services: createGlJournal, createAcctTrans, createAcctgTransEntry</description>
+    <service name="quickCreateAcctgTransAndEntries" engine="simple"
+            location="org/ofbiz/accounting/ledger/GeneralLedgerServices.xml" invoke="quickCreateAcctgTransAndEntries" auth="true">
+        <description>Creates an AcctgTrans and two offsetting AcctgTransEntry records</description>
         <auto-attributes mode="IN" entity-name="AcctgTrans" include="nonpk" optional="true"/>
         <auto-attributes mode="IN" entity-name="AcctgTransEntry" include="nonpk" optional="true">
             <exclude field-name="debitCreditFlag"/>

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=598639&r1=598638&r2=598639&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Tue Nov 27 05:37:06 2007
@@ -395,19 +395,19 @@
         <security https="true" auth="true"/>
         <response name="success" type="view" value="PartyAccountsSummary"/>
     </request-map>
-    <request-map uri="createGlJournalEntry">
+    <request-map uri="quickCreateAcctgTransAndEntries">
         <security https="true" auth="true"/>
-        <event type="service" invoke="createGlJournalEntry"/>
-        <response name="success" type="view" value="NewGlJournalEntry"/>
-        <response name="error" type="view" value="NewGlJournalEntry"/>
+        <event type="service" invoke="quickCreateAcctgTransAndEntries"/>
+        <response name="success" type="view" value="EditAcctgTrans"/>
+        <response name="error" type="view" value="CreateAcctgTransAndEntries"/>
     </request-map>
     <request-map uri="FindAcctgTrans">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="FindAcctgTrans"/>
     </request-map>
-    <request-map uri="NewGlJournalEntry">
+    <request-map uri="CreateAcctgTransAndEntries">
         <security https="true" auth="true"/>
-        <response name="success" type="view" value="NewGlJournalEntry"/>
+        <response name="success" type="view" value="CreateAcctgTransAndEntries"/>
     </request-map>
     <request-map uri="EditAcctgTrans">
         <security https="true" auth="true"/>
@@ -1480,7 +1480,7 @@
     <!-- Party Accounts -->
     <view-map name="PartyAccountsSummary" type="screen" page="component://accounting/widget/GlScreens.xml#PartyAccountsSummary"/>
     <view-map name="FindAcctgTrans" type="screen" page="component://accounting/widget/GlScreens.xml#FindAcctgTrans"/>
-    <view-map name="NewGlJournalEntry" type="screen" page="component://accounting/widget/GlScreens.xml#NewGlJournalEntry"/>
+    <view-map name="CreateAcctgTransAndEntries" type="screen" page="component://accounting/widget/GlScreens.xml#CreateAcctgTransAndEntries"/>
     <view-map name="EditAcctgTrans" type="screen" page="component://accounting/widget/GlScreens.xml#EditAcctgTrans"/>
     <view-map name="FindAcctgTransEntries" type="screen" page="component://accounting/widget/GlScreens.xml#FindAcctgTransEntries"/>
     <view-map name="ListUnpostedAcctgTrans" type="screen" page="component://accounting/widget/GlScreens.xml#ListUnpostedAcctgTrans"/>

Modified: ofbiz/trunk/applications/accounting/widget/GlForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlForms.xml?rev=598639&r1=598638&r2=598639&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlForms.xml Tue Nov 27 05:37:06 2007
@@ -255,7 +255,7 @@
         <field name="amount" position="2"><display type="currency" currency="${currencyUomId}"/></field>
     </form>
 
-    <form name="NewGlJournalEntry" type="single" target="createGlJournalEntry" title="">
+    <form name="CreateAcctgTransAndEntries" type="single" target="quickCreateAcctgTransAndEntries" title="">
         <actions>
             <set field="debitGlAccountClassId" from-field="parameters.debitGlAccountClassId"/>
             <set field="creditGlAccountClassId" from-field="parameters.creditGlAccountClassId"/>

Modified: ofbiz/trunk/applications/accounting/widget/GlScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlScreens.xml?rev=598639&r1=598638&r2=598639&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlScreens.xml Tue Nov 27 05:37:06 2007
@@ -39,10 +39,10 @@
                             <widgets>
                                 <container style="lefthalf">
                                     <container>
-                                        <link target="NewGlJournalEntry?organizationPartyId=${organizationPartyId}&amp;debitGlAccountClassId=CURRENT_ASSET&amp;creditGlAccountClassId=REVENUE&amp;acctgTransTypeId=SALES_ACCTG_TRANS" text="${uiLabelMap.AccountingCreateSalesJournalEntry}" style="buttontext"/>
+                                        <link target="CreateAcctgTransAndEntries?organizationPartyId=${organizationPartyId}&amp;debitGlAccountClassId=CURRENT_ASSET&amp;creditGlAccountClassId=REVENUE&amp;acctgTransTypeId=SALES_ACCTG_TRANS" text="${uiLabelMap.AccountingCreateSalesAcctgTrans}" style="buttontext"/>
                                     </container>
                                     <container>
-                                        <link target="NewGlJournalEntry?organizationPartyId=${organizationPartyId}&amp;debitGlAccountClassId=CASH_EQUIVALENT&amp;creditGlAccountClassId=CURRENT_LIABILITY&amp;acctgTransTypeId=PAYMENT_ACCTG_TRANS" text="${uiLabelMap.AccountingCreatePaymentJournalEntry}" style="buttontext"/>
+                                        <link target="CreateAcctgTransAndEntries?organizationPartyId=${organizationPartyId}&amp;debitGlAccountClassId=CASH_EQUIVALENT&amp;creditGlAccountClassId=CURRENT_LIABILITY&amp;acctgTransTypeId=PAYMENT_ACCTG_TRANS" text="${uiLabelMap.AccountingCreatePaymentAcctgTrans}" style="buttontext"/>
                                     </container>
                                     <container>
                                         <link text="${uiLabelMap.PageTitleUnpostedTransactions}" style="buttontext" target="ListUnpostedAcctgTrans?organizationPartyId=${organizationPartyId}"/>
@@ -81,7 +81,7 @@
                 <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <container>
-                            <link text="${uiLabelMap.AcctgNewGlJournalEntry}" style="buttontext" target="NewGlJournalEntry?organizationPartyId=${organizationPartyId}"/>
+                            <link text="${uiLabelMap.AccountingCreateAcctgTransAndEntries}" style="buttontext" target="CreateAcctgTransAndEntries?organizationPartyId=${organizationPartyId}"/>
                             <link text="${uiLabelMap.PageTitleUnpostedTransactions}" style="buttontext" target="ListUnpostedAcctgTrans?organizationPartyId=${organizationPartyId}"/>
                         </container>
                         <include-form name="FindAcctgTrans" location="component://accounting/widget/GlForms.xml"/>
@@ -124,18 +124,18 @@
         </section>
     </screen>
 
-    <screen name="NewGlJournalEntry">
+    <screen name="CreateAcctgTransAndEntries">
         <section>
             <actions>
-                <set field="titleProperty" value="AcctgNewGlJournalEntry"/>
+                <set field="titleProperty" value="AccountingCreateAcctgTransAndEntries"/>
                 <set field="tabButtonItem" value="FindAcctgTrans"/>
                 <set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/>
-                <set field="labelTitleProperty" value="AcctgNewGlJournalEntry"/>
+                <set field="labelTitleProperty" value="AccountingCreateAcctgTransAndEntries"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <include-form name="NewGlJournalEntry" location="component://accounting/widget/GlForms.xml"/>
+                        <include-form name="CreateAcctgTransAndEntries" location="component://accounting/widget/GlForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -182,9 +182,6 @@
                                <if-empty field-name="isPosted"/>
                             </condition>
                             <widgets>
-                                <container>
-                                    <link target="EditAcctgTrans?acctgTransId=${acctgTransId}&amp;organizationPartyId=${organizationPartyId}" text="${uiLabelMap.AcctgNewGlJournalEntry}" style="buttontext"/>
-                                </container>
                                 <container>
                                     <include-form name="EditAcctgTransEntry" location="component://accounting/widget/GlForms.xml"/>
                                 </container>