svn commit: r1094128 - in /ofbiz/branches/release10.04: ./ applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml

Author: jleroux
Date: Sun Apr 17 10:20:10 2011
New Revision: 1094128

URL: http://svn.apache.org/viewvc?rev=1094128&view=rev
Log:
"Applied fix from trunk for revision: 1094126  "
------------------------------------------------------------------------
r1094126 | jleroux | 2011-04-17 12:15:23 +0200 (dim., 17 avr. 2011) | 8 lines

A patch from Pierre Gaudin "Error in stock reception on same inventory item with same unit price" https://issues.apache.org/jira/browse/OFBIZ-4250

During the reception of stock, if the reception is made on a line of stock which already exists with the same unit price, an accounting transaction due to the stock price value change is created with an amount of debit and credit of 0.

This is not normal and generate an error in the service postAcctgTrans.

This aim of this patch is to avoid creation of accounting transaction linked to the stock price value change if the unit price does not change.

------------------------------------------------------------------------


Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 17 10:20:10 2011
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,943843,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985298,985473,985718,985856,985902,987841,989166,990127,990
 339,990539,991485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625,1028627,1029600,1030016,1030385,1030390,1033928,1033953,1034138,1034179,1035080,1035084,1036426,1036669,1037507,1037559-1037560,1037567,1037883,1038228,1038990,1039256,1040044,1040091,1042009,1042034,1042038,1042132,1042188,1042222,1042317,1042348,1042396,1042411,1042950,1043861,1043996-1043998,1044047,1044084,1044912,1049031,1050602,1051111,1051450,1051812,1052195,1053285,1053289,1054565,1055057,1056072,1056305,1056803,1057519,1058028,1058056,1058488,1059180,1060236,1060261,1060368,1060933,1061167,1061307,1061346,1061886,1061939,1062138,1062144,1062152,1063273,1064090,1064953,1064993,1065550,1066048,1067097,1067942,1069597,1069965,1070193,1070229,1072017,1072378,1074624,1075205,107595
 2,1076115,1080218,1080959,1083144,1084572,1084671,1084689,1084855,1085697,1085774,1090952,1090961,1090964,1092479
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,943843,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985298,985473,985718,985856,985902,987841,989166,990127,990
 339,990539,991485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625,1028627,1029600,1030016,1030385,1030390,1033928,1033953,1034138,1034179,1035080,1035084,1036426,1036669,1037507,1037559-1037560,1037567,1037883,1038228,1038990,1039256,1040044,1040091,1042009,1042034,1042038,1042132,1042188,1042222,1042317,1042348,1042396,1042411,1042950,1043861,1043996-1043998,1044047,1044084,1044912,1049031,1050602,1051111,1051450,1051812,1052195,1053285,1053289,1054565,1055057,1056072,1056305,1056803,1057519,1058028,1058056,1058488,1059180,1060236,1060261,1060368,1060933,1061167,1061307,1061346,1061886,1061939,1062138,1062144,1062152,1063273,1064090,1064953,1064993,1065550,1066048,1067097,1067942,1069597,1069965,1070193,1070229,1072017,1072378,1074624,1075205,107595
 2,1076115,1080218,1080959,1083144,1084572,1084671,1084689,1084855,1085697,1085774,1090952,1090961,1090964,1092479,1094126

Modified: ofbiz/branches/release10.04/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml?rev=1094128&r1=1094127&r2=1094128&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml (original)
+++ ofbiz/branches/release10.04/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml Sun Apr 17 10:20:10 2011
@@ -1420,35 +1420,38 @@ under the License.
                     </calcop>
                 </calcop>
             </calculate>
-            <get-related-one value-field="newInventoryItemDetail" relation-name="InventoryItem" to-value-field="inventoryItem"/>
-            <!-- Credit -->
-            <make-value entity-name="AcctgTransEntry" value-field="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"/>
-            <!-- Debit -->
-            <make-value entity-name="AcctgTransEntry" value-field="debitEntry"/>
-            <set field="debitEntry.debitCreditFlag" value="D"/>
-            <set field="debitEntry.glAccountTypeId" value="INV_ADJ_VAL"/>
-            <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"/>
-
-            <set field="acctgTransEntries[]" from-field="creditEntry" type="Object"/>
-            <set field="acctgTransEntries[]" from-field="debitEntry" type="Object"/>
-
-            <set field="createAcctgTransAndEntriesInMap.glFiscalTypeId" value="ACTUAL"/>
-            <set field="createAcctgTransAndEntriesInMap.acctgTransTypeId" value="INVENTORY"/>
-            <set field="createAcctgTransAndEntriesInMap.inventoryItemId" from-field="parameters.inventoryItemId"/>
-            <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="acctgTransId" result-name="acctgTransId"/>
+            <!-- if originAmount is equals to 0 do not create transaction, this is causing error in postAcctgTrans -->
+            <if-compare operator="not-equals" field="origAmount" value="0">
+                <get-related-one value-field="newInventoryItemDetail" relation-name="InventoryItem" to-value-field="inventoryItem"/>
+                <!-- Credit -->
+                <make-value entity-name="AcctgTransEntry" value-field="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"/>
+                <!-- Debit -->
+                <make-value entity-name="AcctgTransEntry" value-field="debitEntry"/>
+                <set field="debitEntry.debitCreditFlag" value="D"/>
+                <set field="debitEntry.glAccountTypeId" value="INV_ADJ_VAL"/>
+                <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"/>
+    
+                <set field="acctgTransEntries[]" from-field="creditEntry" type="Object"/>
+                <set field="acctgTransEntries[]" from-field="debitEntry" type="Object"/>
+    
+                <set field="createAcctgTransAndEntriesInMap.glFiscalTypeId" value="ACTUAL"/>
+                <set field="createAcctgTransAndEntriesInMap.acctgTransTypeId" value="INVENTORY"/>
+                <set field="createAcctgTransAndEntriesInMap.inventoryItemId" from-field="parameters.inventoryItemId"/>
+                <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="acctgTransId" result-name="acctgTransId"/>
+            </if-compare>
         </if-not-empty>
     </simple-method>