Author: jacopoc
Date: Mon Dec 17 01:39:46 2007
New Revision: 604806
URL: http://svn.apache.org/viewvc?rev=604806&view=rev
Log:
Cleanups for the AcctgTransType seed data.
Modified:
ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.properties
ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
ofbiz/trunk/applications/accounting/widget/GlScreens.xml
Modified:
ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.properties?rev=604806&r1=604805&r2=604806&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.properties
(original)
+++
ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.properties
Mon Dec 17 01:39:46 2007
@@ -256,7 +256,7 @@
AcctgTransType.description.DEPRECIATION=Depreciation
AcctgTransType.description.CAPITALIZATION=Capitalization
AcctgTransType.description.ITEM_VARIANCE_ACCTG=Item Variance
-AcctgTransType.description.OTHER_INTERNAL_ACCTG=Other Internal
+AcctgTransType.description.OTHER_INTERNAL=Other Internal
AcctgTransType.description.PERIOD_CLOSING=Period Closing
AcctgTransType.description.EXTERNAL_ACCTG_TRANS=External
AcctgTransType.description.OBLIGATION_ACCTG_TRA=Obligation
@@ -264,11 +264,11 @@
AcctgTransType.description.CREDIT_MEMO=Credit Memo
AcctgTransType.description.NOTE=Note
AcctgTransType.description.OTHER_OBLIGATION=Other Obligation
-AcctgTransType.description.SALES_ACCTG_TRANS=Sales
+AcctgTransType.description.SALES=Sales
AcctgTransType.description.TAX_DUE=Tax Due
AcctgTransType.description.PAYMENT_ACCTG_TRANS=Payment
-AcctgTransType.description.DISBURSEMENT_ACCTG_T=Disbursement
-AcctgTransType.description.RECEIPT_ACCTG_TRANS=Receipt
+AcctgTransType.description.DISBURSEMENT=Disbursement
+AcctgTransType.description.RECEIPT=Receipt
AcctgTransType.description.INVENTORY_RETURN=Inventory from Return
GlFiscalType.description.ACTUAL=Actual
Modified: ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml?rev=604806&r1=604805&r2=604806&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml (original)
+++ ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml Mon Dec 17
01:39:46 2007
@@ -23,8 +23,8 @@
<AcctgTransType acctgTransTypeId="DEPRECIATION" description="Depreciation"
hasTable="Y" parentTypeId="INTERNAL_ACCTG_TRANS"/>
<AcctgTransType acctgTransTypeId="CAPITALIZATION"
description="Capitalization" hasTable="N" parentTypeId="INTERNAL_ACCTG_TRANS"/>
<AcctgTransType acctgTransTypeId="INVENTORY" description="Inventory"
hasTable="N" parentTypeId="INTERNAL_ACCTG_TRANS"/>
- <AcctgTransType acctgTransTypeId="ITEM_VARIANCE_ACCTG_" description="Item
Variance" hasTable="Y" parentTypeId="INTERNAL_ACCTG_TRANS"/>
- <AcctgTransType acctgTransTypeId="OTHER_INTERNAL_ACCTG" description="Other
Internal" hasTable="N" parentTypeId="INTERNAL_ACCTG_TRANS"/>
+ <AcctgTransType acctgTransTypeId="ITEM_VARIANCE" description="Inventory
Item Variance" hasTable="Y" parentTypeId="INTERNAL_ACCTG_TRANS"/>
+ <AcctgTransType acctgTransTypeId="OTHER_INTERNAL" description="Other
Internal" hasTable="N" parentTypeId="INTERNAL_ACCTG_TRANS"/>
<AcctgTransType acctgTransTypeId="PERIOD_CLOSING" description="Period
Closing" hasTable="N" parentTypeId="INTERNAL_ACCTG_TRANS"/>
<AcctgTransType acctgTransTypeId="EXTERNAL_ACCTG_TRANS"
description="External" hasTable="Y" parentTypeId=""/>
@@ -34,22 +34,23 @@
<AcctgTransType acctgTransTypeId="CREDIT_MEMO" description="Credit Memo"
hasTable="N" parentTypeId="OBLIGATION_ACCTG_TRA"/>
<AcctgTransType acctgTransTypeId="NOTE" description="Note" hasTable="N"
parentTypeId="OBLIGATION_ACCTG_TRA"/>
<AcctgTransType acctgTransTypeId="OTHER_OBLIGATION" description="Other
Obligation" hasTable="N" parentTypeId="OBLIGATION_ACCTG_TRA"/>
- <AcctgTransType acctgTransTypeId="SALES_ACCTG_TRANS" description="Sales"
hasTable="Y" parentTypeId="OBLIGATION_ACCTG_TRA"/>
+ <AcctgTransType acctgTransTypeId="SALES" description="Sales" hasTable="Y"
parentTypeId="OBLIGATION_ACCTG_TRA"/>
<AcctgTransType acctgTransTypeId="TAX_DUE" description="Tax Due"
hasTable="N" parentTypeId="OBLIGATION_ACCTG_TRA"/>
<AcctgTransType acctgTransTypeId="PAYMENT_ACCTG_TRANS"
description="Payment" hasTable="Y" parentTypeId="EXTERNAL_ACCTG_TRANS"/>
- <AcctgTransType acctgTransTypeId="DISBURSEMENT_ACCTG_T"
description="Disbursement" hasTable="N" parentTypeId="PAYMENT_ACCTG_TRANS"/>
- <AcctgTransType acctgTransTypeId="RECEIPT_ACCTG_TRANS"
description="Receipt" hasTable="N" parentTypeId="PAYMENT_ACCTG_TRANS"/>
+ <AcctgTransType acctgTransTypeId="DISBURSEMENT" description="Disbursement"
hasTable="N" parentTypeId="PAYMENT_ACCTG_TRANS"/>
+ <AcctgTransType acctgTransTypeId="RECEIPT" description="Receipt"
hasTable="N" parentTypeId="PAYMENT_ACCTG_TRANS"/>
<AcctgTransType acctgTransTypeId="INVENTORY_RETURN" description="Inventory
from Return" hasTable="N" parentTypeId="EXTERNAL_ACCTG_TRANS"/>
- <AcctgTransType acctgTransTypeId="SALES_SHIPMENT" parentTypeId=""
hasTable="N" description="Sales Shipment"/>
- <AcctgTransType acctgTransTypeId="SALES_INVOICE" parentTypeId=""
hasTable="N" description="Sales Invoice"/>
- <AcctgTransType acctgTransTypeId="PURCHASE_INVOICE" parentTypeId=""
hasTable="N" description="Purchase Invoice"/>
- <AcctgTransType acctgTransTypeId="SHIPMENT_RECEIPT" parentTypeId=""
hasTable="N" description="Shipment Receipt"/>
- <AcctgTransType acctgTransTypeId="MANUFACTURING" parentTypeId=""
hasTable="N" description="Manufacturing"/>
+ <AcctgTransType acctgTransTypeId="SALES_INVOICE" description="Sales
Invoice" hasTable="N" parentTypeId="OBLIGATION_ACCTG_TRA"/><!-- FIXME: replace
with "SALES" -->
+ <AcctgTransType acctgTransTypeId="PURCHASE_INVOICE" description="Purchase
Invoice" hasTable="N" parentTypeId="OBLIGATION_ACCTG_TRA"/><!-- FIXME: replace
with "SALES" -->
+ <AcctgTransType acctgTransTypeId="SALES_SHIPMENT" description="Sales
Shipment" hasTable="N" parentTypeId="EXTERNAL_ACCTG_TRANS"/>
+ <AcctgTransType acctgTransTypeId="SHIPMENT_RECEIPT" description="Shipment
Receipt" hasTable="N" parentTypeId="EXTERNAL_ACCTG_TRANS"/>
+ <AcctgTransType acctgTransTypeId="MANUFACTURING"
description="Manufacturing" hasTable="N" parentTypeId=""/>
- <AcctgTransType acctgTransTypeId="INCOMING_PAYMENT" description="Incoming
Payment" hasTable="N" parentTypeId=""/>
+ <AcctgTransType acctgTransTypeId="INCOMING_PAYMENT" description="Incoming
Payment" hasTable="N" parentTypeId=""/><!-- FIXME: replace with "RECEIPT" -->
+ <AcctgTransType acctgTransTypeId="OUTGOING_PAYMENT" description="Outgoing
Payment" hasTable="N" parentTypeId=""/><!-- FIXME: replace with "DISBURSEMENT"
-->
<AcctgTransEntryType acctgTransEntryTypeId="_NA_" description="Not
Applicable" hasTable="N" parentTypeId=""/>
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml?rev=604806&r1=604805&r2=604806&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml
(original)
+++
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml
Mon Dec 17 01:39:46 2007
@@ -90,7 +90,7 @@
<set field="mainAcctgTransEntry.debitCreditFlag" value="D"/>
<set field="offsetAcctgTransEntry.debitCreditFlag" value="C"/>
- <set field="createAcctgTransAndEntriesMap.acctgTransTypeId"
value="RECEIPT_ACCTG_TRANS"/>
+ <set field="createAcctgTransAndEntriesMap.acctgTransTypeId"
value="RECEIPT"/>
</then>
<else-if>
<condition><if-compare
field-name="finAccountTrans.finAccountTransTypeId" operator="equals"
value="WITHDRAWAL"/></condition>
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=604806&r1=604805&r2=604806&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
Mon Dec 17 01:39:46 2007
@@ -391,7 +391,7 @@
<simple-method method-name="getGlAccountFromAccountType"
short-description="Look up a GlAccountId from GlAccountTypeId">
<!-- if this is an inventory variance then the glAccountTypeId
contains the varianceReasonId; the value is used to lookup the account id in
the VarianceReasonGlAccount entity -->
- <if-compare field-name="parameters.acctgTransTypeId" operator="equals"
value="ITEM_VARIANCE_ACCTG_">
+ <if-compare field-name="parameters.acctgTransTypeId" operator="equals"
value="ITEM_VARIANCE">
<entity-one entity-name="VarianceReasonGlAccount"
value-name="varianceReasonGlAccount">
<field-map field-name="organizationPartyId"
env-name="parameters.organizationPartyId"/>
<field-map field-name="varianceReasonId"
env-name="parameters.glAccountTypeId"/>
@@ -1037,7 +1037,7 @@
<set field="createAcctgTransAndEntriesInMap.glFiscalTypeId"
value="ACTUAL"/>
<set field="createAcctgTransAndEntriesInMap.acctgTransEntries"
from-field="acctgTransEntries"/>
<set field="createAcctgTransAndEntriesInMap.physicalInventoryId"
from-field="parameters.physicalInventoryId"/>
- <set field="createAcctgTransAndEntriesInMap.acctgTransTypeId"
value="ITEM_VARIANCE_ACCTG_"/>
+ <set field="createAcctgTransAndEntriesInMap.acctgTransTypeId"
value="ITEM_VARIANCE"/>
<call-service service-name="createAcctgTransAndEntries"
in-map-name="createAcctgTransAndEntriesInMap">
<result-to-field result-name="acctgTransId"/>
</call-service>
Modified: ofbiz/trunk/applications/accounting/widget/GlScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlScreens.xml?rev=604806&r1=604805&r2=604806&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlScreens.xml Mon Dec 17
01:39:46 2007
@@ -39,7 +39,7 @@
<widgets>
<container style="lefthalf">
<container>
- <link
target="CreateAcctgTransAndEntries?organizationPartyId=${organizationPartyId}&debitGlAccountClassId=CURRENT_ASSET&creditGlAccountClassId=REVENUE&acctgTransTypeId=SALES_ACCTG_TRANS"
text="${uiLabelMap.AccountingCreateSalesAcctgTrans}" style="buttontext"/>
+ <link
target="CreateAcctgTransAndEntries?organizationPartyId=${organizationPartyId}&debitGlAccountClassId=CURRENT_ASSET&creditGlAccountClassId=REVENUE&acctgTransTypeId=SALES"
text="${uiLabelMap.AccountingCreateSalesAcctgTrans}" style="buttontext"/>
</container>
<container>
<link
target="CreateAcctgTransAndEntries?organizationPartyId=${organizationPartyId}&debitGlAccountClassId=CASH_EQUIVALENT&creditGlAccountClassId=CURRENT_LIABILITY&acctgTransTypeId=PAYMENT_ACCTG_TRANS"
text="${uiLabelMap.AccountingCreatePaymentAcctgTrans}" style="buttontext"/>
