svn commit: r602521 - in /ofbiz/trunk/applications/accounting: script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml servicedef/secas_ledger.xml servicedef/services_ledger.xml

[jacopoc]

Author: jacopoc
Date: Sat Dec  8 09:57:56 2007
New Revision: 602521

URL: http://svn.apache.org/viewvc?rev=602521&view=rev
Log:
Removed deprecated/never used service.

Modified:
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
    ofbiz/trunk/applications/accounting/servicedef/secas_ledger.xml
    ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml

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=602521&r1=602520&r2=602521&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 Sat Dec  8 09:57:56 2007
@@ -551,67 +551,6 @@
         <field-to-result field-name="acctgTransId" result-name="acctgTransId"/>        
     </simple-method>
 
-    <!-- DEPRECATED: use createAcctgTransForSalesShipmentIssuance instead -->
-    <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"/>
-        <log level="info" message="Using ledger decimals [${ledgerDecimals}] and rounding [${roundingMode}]"/>
-
-        <entity-and entity-name="ItemIssuance" list-name="itemIssuances">
-            <field-map field-name="shipmentId" env-name="parameters.shipmentId"/>
-        </entity-and>
-        <iterate list-name="itemIssuances" entry-name="itemIssuance">
-            <get-related-one value-name="itemIssuance" relation-name="InventoryItem" to-value-name="inventoryItem"/>
-            <entity-and entity-name="OrderRole" list-name="billToCustomers">
-                <field-map field-name="orderId" env-name="itemIssuance.orderId"/>
-                <field-map field-name="roleTypeId" value="BILL_TO_CUSTOMER"/>
-            </entity-and>
-            <first-from-list list-name="billToCustomers" entry-name="billToCustomer"/>
-            <!-- TODO: handle serialized inventory -->
-            <calculate field-name="origAmount" type="BigDecimal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}">
-                <calcop operator="multiply">
-                    <calcop operator="get" field-name="itemIssuance.quantity"/>
-                    <calcop operator="get" field-name="inventoryItem.unitCost"/>
-                </calcop>
-            </calculate>
-            <!-- Credit -->
-            <make-value entity-name="AcctgTransEntry" value-name="creditEntry"/>
-            <set field="creditEntry.debitCreditFlag" value="C"/>
-            <set field="creditEntry.glAccountTypeId" value="INVENTORY_ACCOUNT"/>
-            <set field="creditEntry.organizationPartyId" from-field="inventoryItem.ownerPartyId"/>
-            <set field="creditEntry.productId" from-field="inventoryItem.productId"/>
-            <set field="creditEntry.origAmount" from-field="origAmount"/>
-            <set field="creditEntry.origCurrencyUomId" from-field="inventoryItem.currencyUomId"/>
-            <if-not-empty field-name="billToCustomer">
-                <set field="creditEntry.partyId" from-field="billToCustomer.partyId"/>
-                <set field="creditEntry.roleTypeId" from-field="billToCustomer.roleTypeId"/>
-            </if-not-empty>
-            <!-- Debit -->
-            <make-value entity-name="AcctgTransEntry" value-name="debitEntry"/>
-            <set field="debitEntry.debitCreditFlag" value="D"/>
-            <set field="debitEntry.glAccountTypeId" value="COGS_ACCOUNT"/>
-            <set field="debitEntry.organizationPartyId" from-field="inventoryItem.ownerPartyId"/>
-            <set field="debitEntry.productId" from-field="inventoryItem.productId"/>
-            <set field="debitEntry.origAmount" from-field="origAmount"/>
-            <set field="debitEntry.origCurrencyUomId" from-field="inventoryItem.currencyUomId"/>
-            <if-not-empty field-name="billToCustomer">
-                <set field="debitEntry.partyId" from-field="billToCustomer.partyId"/>
-                <set field="debitEntry.roleTypeId" from-field="billToCustomer.roleTypeId"/>
-            </if-not-empty>
-            <set field="acctgTransEntries[]" from-field="creditEntry" type="Object"/>
-            <set field="acctgTransEntries[]" from-field="debitEntry" type="Object"/>
-        </iterate>
-        <set field="createAcctgTransAndEntriesInMap.glFiscalTypeId" value="ACTUAL"/>
-        <set field="createAcctgTransAndEntriesInMap.acctgTransTypeId" value="SALES_SHIPMENT"/>
-        <set field="createAcctgTransAndEntriesInMap.shipmentId" from-field="parameters.shipmentId"/>
-        <set field="createAcctgTransAndEntriesInMap.acctgTransEntries" from-field="acctgTransEntries"/>
-        <call-service service-name="createAcctgTransAndEntries" in-map-name="createAcctgTransAndEntriesInMap">
-            <result-to-field result-name="acctgTransId"/>
-        </call-service>
-        <field-to-result field-name="acctgTransId" result-name="acctgTransId"/>        
-    </simple-method>
-    
     <simple-method method-name="createAcctgTransForInventoryItemCostChange" short-description="Create accounting transaction when item cost is changed (D: INV_ADJ_VAL, C: INVENTORY_ACCOUNT)">
         <!-- retrieve ledger rounding properties -->        
         <property-to-field resource="arithmetic" property="ledger.decimals" field-name="ledgerDecimals"/>

Modified: ofbiz/trunk/applications/accounting/servicedef/secas_ledger.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/secas_ledger.xml?rev=602521&r1=602520&r2=602521&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/secas_ledger.xml (original)
+++ ofbiz/trunk/applications/accounting/servicedef/secas_ledger.xml Sat Dec  8 09:57:56 2007
@@ -26,14 +26,7 @@
         <condition field-name="shipmentId" operator="is-not-empty"/>
         <action service="createAcctgTransForSalesShipmentIssuance" mode="sync"/>
     </eca>
-    <!-- DEPRECATED
-    <eca service="updateShipment" event="commit">
-        <condition field-name="shipmentTypeId" operator="equals" value="SALES_SHIPMENT"/>
-        <condition-field field-name="statusId" operator="not-equals" to-field-name="oldStatusId"/>
-        <condition field-name="statusId" operator="equals" value="SHIPMENT_PACKED"/>
-        <action service="createAcctgTransForSalesShipment" mode="sync"/>
-    </eca>
-    -->
+
     <!-- create the accounting transactions for a shipment receipt every time the inventory is received -->
     <eca service="createShipmentReceipt" event="commit">
         <action service="createAcctgTransForShipmentReceipt" mode="sync"/>

Modified: ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml?rev=602521&r1=602520&r2=602521&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml (original)
+++ ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml Sat Dec  8 09:57:56 2007
@@ -313,13 +313,6 @@
         <attribute name="inventoryItemDetailSeqId" type="String" mode="IN" optional="false"/>
         <attribute name="acctgTransId" type="String" mode="OUT" optional="true"/>
     </service>
-    <!-- DEPRECATED: use createAcctgTransForSalesShipmentIssuance instead -->
-    <service name="createAcctgTransForSalesShipment" engine="simple"  auth="true"
-        location="org/ofbiz/accounting/ledger/GeneralLedgerServices.xml" invoke="createAcctgTransForSalesShipment">
-        <description>Create accounting transactions for issuances for a sales shipment (D: INVENTORY_ACCOUNT, C: COGS_ACCOUNT)</description>
-        <attribute name="shipmentId" type="String" mode="IN" optional="false"/>
-        <attribute name="acctgTransId" type="String" mode="OUT" optional="true"/>
-    </service>
     <service name="createAcctgTransForShipmentReceipt" engine="simple"  auth="true"
         location="org/ofbiz/accounting/ledger/GeneralLedgerServices.xml" invoke="createAcctgTransForShipmentReceipt">
         <description>Create an accounting transactions for a shipment receipt (D: INVENTORY_ACCOUNT, C: UNINVOICED_SHIP_RCPT or COGS_ACCOUNT for returns)</description>