You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2010/09/28 09:48:09 UTC
svn commit: r1002044 - in /ofbiz/branches/jquery: ./
applications/accounting/script/org/ofbiz/accounting/ledger/
applications/order/script/org/ofbiz/order/customer/
applications/party/webapp/partymgr/WEB-INF/actions/party/
applications/product/script/o...
Author: jleroux
Date: Tue Sep 28 07:48:09 2010
New Revision: 1002044
URL: http://svn.apache.org/viewvc?rev=1002044&view=rev
Log:
Merges the trunk at r1001962
Fix last error due to recent Accounting changes
Modified:
ofbiz/branches/jquery/ (props changed)
ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed)
ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed)
ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed)
ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml (props changed)
ofbiz/branches/jquery/specialpurpose/ebaystore/lib/ (props changed)
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed)
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed)
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed)
Propchange: ofbiz/branches/jquery/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 07:48:09 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:951708-1001901
+/ofbiz/trunk:951708-1002043
Modified: ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml?rev=1002044&r1=1002043&r2=1002044&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml (original)
+++ ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml Tue Sep 28 07:48:09 2010
@@ -2127,18 +2127,26 @@ under the License.
</iterate>
</iterate-map>
<!-- Another entry for tax not attributed to a taxAuthPartyId -->
- <clear-field field="debitEntry"/>
- <make-value entity-name="AcctgTransEntry" value-field="debitEntry"/>
- <set field="debitEntry.debitCreditFlag" value="D"/>
- <set field="debitEntry.organizationPartyId" from-field="invoice.partyId"/>
<call-class-method method-name="getInvoiceUnattributedTaxTotal" class-name="org.ofbiz.accounting.invoice.InvoiceWorker"
ret-field="taxAmount">
<field field="invoice" type="GenericValue"/>
</call-class-method>
- <set field="debitEntry.origAmount" from-field="taxAmount"/>
- <set field="debitEntry.origCurrencyUomId" from-field="invoice.currencyUomId"/>
- <set field="acctgTransEntries[]" from-field="debitEntry" type="Object"/>
-
+ <if>
+ <condition>
+ <and>
+ <if-compare field="taxAmount" operator="greater" value="0" type="BigDecimal"/>
+ </and>
+ </condition>
+ <then>
+ <clear-field field="debitEntry"/>
+ <make-value entity-name="AcctgTransEntry" value-field="debitEntry"/>
+ <set field="debitEntry.debitCreditFlag" value="D"/>
+ <set field="debitEntry.organizationPartyId" from-field="invoice.partyId"/>
+ <set field="debitEntry.origAmount" from-field="taxAmount"/>
+ <set field="debitEntry.origCurrencyUomId" from-field="invoice.currencyUomId"/>
+ <set field="acctgTransEntries[]" from-field="debitEntry" type="Object"/>
+ </then>
+ </if>
<!-- Credit -->
<make-value entity-name="AcctgTransEntry" value-field="creditEntry"/>
<set field="creditEntry.debitCreditFlag" value="C"/>
Propchange: ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 07:48:09 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:921280-927264
-/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-1001901
+/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-1002043
Propchange: ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 07:48:09 2010
@@ -1,3 +1,3 @@
/incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:418499-490456
/ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:921280-927264
-/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-1001901
+/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-1002043
Propchange: ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 07:48:09 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt/applications/product/script/org/ofbiz/shipment/test/FacilityTests.xml:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:921280-927264
-/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-1001901
+/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-1002043
Propchange: ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 07:48:09 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt/applications/commonext/widget/HelpScreens.xml:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264
-/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-1001901
+/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-1002043
Propchange: ofbiz/branches/jquery/specialpurpose/ebaystore/lib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 07:48:09 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt/specialpurpose/ebay/lib:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264
-/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-1001901
+/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-1002043
Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 07:48:09 2010
@@ -1,3 +1,3 @@
/incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:418499-490456
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-1001901
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-1002043
Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 07:48:09 2010
@@ -1,3 +1,3 @@
/incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:418499-490456
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-1001901
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-1002043
Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 07:48:09 2010
@@ -1,3 +1,3 @@
/incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:418499-490456
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-1001901
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-1002043
Re: svn commit: r1002044 - in /ofbiz/branches/jquery: ./ applications/accounting/script/org/ofbiz/accounting/ledger/ applications/order/script/org/ofbiz/order/customer/ applications/party/webapp/partymgr/WEB-INF/actions/party/ applications/product/script/o
Posted by Scott Gray <sc...@hotwaxmedia.com>.
Far be it from me to get in the way of your work Jacques.
Scott
On 28/09/2010, at 9:45 PM, Jacques Le Roux wrote:
> Sorry to disturb you but we are using it and someone is working on the accounting component currently.
>
> Jacques
>
> Scott Gray wrote:
>> I hate to be the guy that's always complaining about stuff, but do you really need to keep this branch level with the trunk every
>> single day? I have a hard time keeping up with all of the commit messages and virtually doubling their number certainly doesn't
>> make things any easier.
>>
>> On a side rant, I personally believe that the majority of committers desires to keep their custom projects up to date with the
>> trunk actually does OFBiz more harm than good.
>>
>> Regards
>> Scott
>>
>> On 28/09/2010, at 8:48 PM, jleroux@apache.org wrote:
>>
>>> Author: jleroux
>>> Date: Tue Sep 28 07:48:09 2010
>>> New Revision: 1002044
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1002044&view=rev
>>> Log:
>>> Merges the trunk at r1001962
>>>
>>> Fix last error due to recent Accounting changes
>>>
>>> Modified:
>>> ofbiz/branches/jquery/ (props changed)
>>> ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
>>> ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed)
>>> ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed)
>>> ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed)
>>> ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml (props changed)
>>> ofbiz/branches/jquery/specialpurpose/ebaystore/lib/ (props changed)
>>> ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed)
>>> ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed)
>>> ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed)
>>>
>>> Propchange: ofbiz/branches/jquery/
>>> ------------------------------------------------------------------------------
>>> --- svn:mergeinfo (original)
>>> +++ svn:mergeinfo Tue Sep 28 07:48:09 2010
>>> @@ -1,3 +1,3 @@
>>> /ofbiz/branches/addbirt:831210-885099,885686-886087
>>> /ofbiz/branches/multitenant20100310:921280-927264
>>> -/ofbiz/trunk:951708-1001901
>>> +/ofbiz/trunk:951708-1002043
>>>
>>> Modified: ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml?rev=1002044&r1=1002043&r2=1002044&view=diff
>>> ============================================================================== ---
>>> ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml (original) +++
>>> ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml Tue Sep 28 07:48:09
>>> 2010 @@ -2127,18 +2127,26 @@ under the License. </iterate>
>>> </iterate-map>
>>> <!-- Another entry for tax not attributed to a taxAuthPartyId -->
>>> - <clear-field field="debitEntry"/>
>>> - <make-value entity-name="AcctgTransEntry" value-field="debitEntry"/>
>>> - <set field="debitEntry.debitCreditFlag" value="D"/>
>>> - <set field="debitEntry.organizationPartyId" from-field="invoice.partyId"/>
>>> <call-class-method method-name="getInvoiceUnattributedTaxTotal"
>>> class-name="org.ofbiz.accounting.invoice.InvoiceWorker" ret-field="taxAmount">
>>> <field field="invoice" type="GenericValue"/>
>>> </call-class-method>
>>> - <set field="debitEntry.origAmount" from-field="taxAmount"/>
>>> - <set field="debitEntry.origCurrencyUomId" from-field="invoice.currencyUomId"/>
>>> - <set field="acctgTransEntries[]" from-field="debitEntry" type="Object"/>
>>> -
>>> + <if>
>>> + <condition>
>>> + <and>
>>> + <if-compare field="taxAmount" operator="greater" value="0" type="BigDecimal"/>
>>> + </and>
>>> + </condition>
>>> + <then>
>>> + <clear-field field="debitEntry"/>
>>> + <make-value entity-name="AcctgTransEntry" value-field="debitEntry"/>
>>> + <set field="debitEntry.debitCreditFlag" value="D"/>
>>> + <set field="debitEntry.organizationPartyId" from-field="invoice.partyId"/>
>>> + <set field="debitEntry.origAmount" from-field="taxAmount"/>
>>> + <set field="debitEntry.origCurrencyUomId" from-field="invoice.currencyUomId"/>
>>> + <set field="acctgTransEntries[]" from-field="debitEntry" type="Object"/>
>>> + </then>
>>> + </if>
>>> <!-- Credit -->
>>> <make-value entity-name="AcctgTransEntry" value-field="creditEntry"/>
>>> <set field="creditEntry.debitCreditFlag" value="C"/>
>>>
>>> Propchange: ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
>>> ------------------------------------------------------------------------------
>>> --- svn:mergeinfo (original)
>>> +++ svn:mergeinfo Tue Sep 28 07:48:09 2010
>>> @@ -1,3 +1,3 @@
>>> /ofbiz/branches/addbirt/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml:831210-885099,885686-886087
>>> /ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:921280-927264
>>> -/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-1001901
>>> +/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-1002043
>>>
>>> Propchange: ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
>>> ------------------------------------------------------------------------------
>>> --- svn:mergeinfo (original)
>>> +++ svn:mergeinfo Tue Sep 28 07:48:09 2010
>>> @@ -1,3 +1,3 @@
>>> /incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:418499-490456
>>> /ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:921280-927264
>>> -/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-1001901
>>> +/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-1002043
>>>
>>> Propchange: ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml
>>> ------------------------------------------------------------------------------
>>> --- svn:mergeinfo (original)
>>> +++ svn:mergeinfo Tue Sep 28 07:48:09 2010
>>> @@ -1,3 +1,3 @@
>>> /ofbiz/branches/addbirt/applications/product/script/org/ofbiz/shipment/test/FacilityTests.xml:831210-885099,885686-886087
>>> /ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:921280-927264
>>> -/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-1001901
>>> +/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-1002043
>>>
>>> Propchange: ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml
>>> ------------------------------------------------------------------------------
>>> --- svn:mergeinfo (original)
>>> +++ svn:mergeinfo Tue Sep 28 07:48:09 2010
>>> @@ -1,3 +1,3 @@
>>> /ofbiz/branches/addbirt/applications/commonext/widget/HelpScreens.xml:831210-885099,885686-886087
>>> /ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264
>>> -/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-1001901
>>> +/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-1002043
>>>
>>> Propchange: ofbiz/branches/jquery/specialpurpose/ebaystore/lib/
>>> ------------------------------------------------------------------------------
>>> --- svn:mergeinfo (original)
>>> +++ svn:mergeinfo Tue Sep 28 07:48:09 2010
>>> @@ -1,3 +1,3 @@
>>> /ofbiz/branches/addbirt/specialpurpose/ebay/lib:831210-885099,885686-886087
>>> /ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264
>>> -/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-1001901
>>> +/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-1002043
>>>
>>> Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
>>> ------------------------------------------------------------------------------
>>> --- svn:mergeinfo (original)
>>> +++ svn:mergeinfo Tue Sep 28 07:48:09 2010
>>> @@ -1,3 +1,3 @@
>>> /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:418499-490456
>>> /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264
>>> -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-1001901
>>> +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-1002043
>>>
>>> Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
>>> ------------------------------------------------------------------------------
>>> --- svn:mergeinfo (original)
>>> +++ svn:mergeinfo Tue Sep 28 07:48:09 2010
>>> @@ -1,3 +1,3 @@
>>> /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:418499-490456
>>> /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264
>>> -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-1001901
>>> +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-1002043
>>>
>>> Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
>>> ------------------------------------------------------------------------------
>>> --- svn:mergeinfo (original)
>>> +++ svn:mergeinfo Tue Sep 28 07:48:09 2010
>>> @@ -1,3 +1,3 @@
>>> /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:418499-490456
>>> /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264
>>> -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-1001901
>>> +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-1002043
>
>
Re: svn commit: r1002044 - in /ofbiz/branches/jquery: ./ applications/accounting/script/org/ofbiz/accounting/ledger/ applications/order/script/org/ofbiz/order/customer/ applications/party/webapp/partymgr/WEB-INF/actions/party/ applications/product/script/o
Posted by Jacques Le Roux <ja...@les7arts.com>.
Sorry to disturb you but we are using it and someone is working on the accounting component currently.
Jacques
Scott Gray wrote:
> I hate to be the guy that's always complaining about stuff, but do you really need to keep this branch level with the trunk every
> single day? I have a hard time keeping up with all of the commit messages and virtually doubling their number certainly doesn't
> make things any easier.
>
> On a side rant, I personally believe that the majority of committers desires to keep their custom projects up to date with the
> trunk actually does OFBiz more harm than good.
>
> Regards
> Scott
>
> On 28/09/2010, at 8:48 PM, jleroux@apache.org wrote:
>
>> Author: jleroux
>> Date: Tue Sep 28 07:48:09 2010
>> New Revision: 1002044
>>
>> URL: http://svn.apache.org/viewvc?rev=1002044&view=rev
>> Log:
>> Merges the trunk at r1001962
>>
>> Fix last error due to recent Accounting changes
>>
>> Modified:
>> ofbiz/branches/jquery/ (props changed)
>> ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
>> ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed)
>> ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed)
>> ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed)
>> ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml (props changed)
>> ofbiz/branches/jquery/specialpurpose/ebaystore/lib/ (props changed)
>> ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed)
>> ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed)
>> ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed)
>>
>> Propchange: ofbiz/branches/jquery/
>> ------------------------------------------------------------------------------
>> --- svn:mergeinfo (original)
>> +++ svn:mergeinfo Tue Sep 28 07:48:09 2010
>> @@ -1,3 +1,3 @@
>> /ofbiz/branches/addbirt:831210-885099,885686-886087
>> /ofbiz/branches/multitenant20100310:921280-927264
>> -/ofbiz/trunk:951708-1001901
>> +/ofbiz/trunk:951708-1002043
>>
>> Modified: ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml?rev=1002044&r1=1002043&r2=1002044&view=diff
>> ============================================================================== ---
>> ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml (original) +++
>> ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml Tue Sep 28 07:48:09
>> 2010 @@ -2127,18 +2127,26 @@ under the License. </iterate>
>> </iterate-map>
>> <!-- Another entry for tax not attributed to a taxAuthPartyId -->
>> - <clear-field field="debitEntry"/>
>> - <make-value entity-name="AcctgTransEntry" value-field="debitEntry"/>
>> - <set field="debitEntry.debitCreditFlag" value="D"/>
>> - <set field="debitEntry.organizationPartyId" from-field="invoice.partyId"/>
>> <call-class-method method-name="getInvoiceUnattributedTaxTotal"
>> class-name="org.ofbiz.accounting.invoice.InvoiceWorker" ret-field="taxAmount">
>> <field field="invoice" type="GenericValue"/>
>> </call-class-method>
>> - <set field="debitEntry.origAmount" from-field="taxAmount"/>
>> - <set field="debitEntry.origCurrencyUomId" from-field="invoice.currencyUomId"/>
>> - <set field="acctgTransEntries[]" from-field="debitEntry" type="Object"/>
>> -
>> + <if>
>> + <condition>
>> + <and>
>> + <if-compare field="taxAmount" operator="greater" value="0" type="BigDecimal"/>
>> + </and>
>> + </condition>
>> + <then>
>> + <clear-field field="debitEntry"/>
>> + <make-value entity-name="AcctgTransEntry" value-field="debitEntry"/>
>> + <set field="debitEntry.debitCreditFlag" value="D"/>
>> + <set field="debitEntry.organizationPartyId" from-field="invoice.partyId"/>
>> + <set field="debitEntry.origAmount" from-field="taxAmount"/>
>> + <set field="debitEntry.origCurrencyUomId" from-field="invoice.currencyUomId"/>
>> + <set field="acctgTransEntries[]" from-field="debitEntry" type="Object"/>
>> + </then>
>> + </if>
>> <!-- Credit -->
>> <make-value entity-name="AcctgTransEntry" value-field="creditEntry"/>
>> <set field="creditEntry.debitCreditFlag" value="C"/>
>>
>> Propchange: ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
>> ------------------------------------------------------------------------------
>> --- svn:mergeinfo (original)
>> +++ svn:mergeinfo Tue Sep 28 07:48:09 2010
>> @@ -1,3 +1,3 @@
>> /ofbiz/branches/addbirt/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml:831210-885099,885686-886087
>> /ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:921280-927264
>> -/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-1001901
>> +/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-1002043
>>
>> Propchange: ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
>> ------------------------------------------------------------------------------
>> --- svn:mergeinfo (original)
>> +++ svn:mergeinfo Tue Sep 28 07:48:09 2010
>> @@ -1,3 +1,3 @@
>> /incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:418499-490456
>> /ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:921280-927264
>> -/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-1001901
>> +/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-1002043
>>
>> Propchange: ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml
>> ------------------------------------------------------------------------------
>> --- svn:mergeinfo (original)
>> +++ svn:mergeinfo Tue Sep 28 07:48:09 2010
>> @@ -1,3 +1,3 @@
>> /ofbiz/branches/addbirt/applications/product/script/org/ofbiz/shipment/test/FacilityTests.xml:831210-885099,885686-886087
>> /ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:921280-927264
>> -/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-1001901
>> +/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-1002043
>>
>> Propchange: ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml
>> ------------------------------------------------------------------------------
>> --- svn:mergeinfo (original)
>> +++ svn:mergeinfo Tue Sep 28 07:48:09 2010
>> @@ -1,3 +1,3 @@
>> /ofbiz/branches/addbirt/applications/commonext/widget/HelpScreens.xml:831210-885099,885686-886087
>> /ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264
>> -/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-1001901
>> +/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-1002043
>>
>> Propchange: ofbiz/branches/jquery/specialpurpose/ebaystore/lib/
>> ------------------------------------------------------------------------------
>> --- svn:mergeinfo (original)
>> +++ svn:mergeinfo Tue Sep 28 07:48:09 2010
>> @@ -1,3 +1,3 @@
>> /ofbiz/branches/addbirt/specialpurpose/ebay/lib:831210-885099,885686-886087
>> /ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264
>> -/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-1001901
>> +/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-1002043
>>
>> Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
>> ------------------------------------------------------------------------------
>> --- svn:mergeinfo (original)
>> +++ svn:mergeinfo Tue Sep 28 07:48:09 2010
>> @@ -1,3 +1,3 @@
>> /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:418499-490456
>> /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264
>> -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-1001901
>> +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-1002043
>>
>> Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
>> ------------------------------------------------------------------------------
>> --- svn:mergeinfo (original)
>> +++ svn:mergeinfo Tue Sep 28 07:48:09 2010
>> @@ -1,3 +1,3 @@
>> /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:418499-490456
>> /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264
>> -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-1001901
>> +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-1002043
>>
>> Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
>> ------------------------------------------------------------------------------
>> --- svn:mergeinfo (original)
>> +++ svn:mergeinfo Tue Sep 28 07:48:09 2010
>> @@ -1,3 +1,3 @@
>> /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:418499-490456
>> /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264
>> -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-1001901
>> +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-1002043
Re: svn commit: r1002044 - in /ofbiz/branches/jquery: ./ applications/accounting/script/org/ofbiz/accounting/ledger/ applications/order/script/org/ofbiz/order/customer/ applications/party/webapp/partymgr/WEB-INF/actions/party/ applications/product/script/o...
Posted by Scott Gray <sc...@hotwaxmedia.com>.
I hate to be the guy that's always complaining about stuff, but do you really need to keep this branch level with the trunk every single day? I have a hard time keeping up with all of the commit messages and virtually doubling their number certainly doesn't make things any easier.
On a side rant, I personally believe that the majority of committers desires to keep their custom projects up to date with the trunk actually does OFBiz more harm than good.
Regards
Scott
On 28/09/2010, at 8:48 PM, jleroux@apache.org wrote:
> Author: jleroux
> Date: Tue Sep 28 07:48:09 2010
> New Revision: 1002044
>
> URL: http://svn.apache.org/viewvc?rev=1002044&view=rev
> Log:
> Merges the trunk at r1001962
>
> Fix last error due to recent Accounting changes
>
> Modified:
> ofbiz/branches/jquery/ (props changed)
> ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
> ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed)
> ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed)
> ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed)
> ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml (props changed)
> ofbiz/branches/jquery/specialpurpose/ebaystore/lib/ (props changed)
> ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed)
> ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed)
> ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed)
>
> Propchange: ofbiz/branches/jquery/
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Sep 28 07:48:09 2010
> @@ -1,3 +1,3 @@
> /ofbiz/branches/addbirt:831210-885099,885686-886087
> /ofbiz/branches/multitenant20100310:921280-927264
> -/ofbiz/trunk:951708-1001901
> +/ofbiz/trunk:951708-1002043
>
> Modified: ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
> URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml?rev=1002044&r1=1002043&r2=1002044&view=diff
> ==============================================================================
> --- ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml (original)
> +++ ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml Tue Sep 28 07:48:09 2010
> @@ -2127,18 +2127,26 @@ under the License.
> </iterate>
> </iterate-map>
> <!-- Another entry for tax not attributed to a taxAuthPartyId -->
> - <clear-field field="debitEntry"/>
> - <make-value entity-name="AcctgTransEntry" value-field="debitEntry"/>
> - <set field="debitEntry.debitCreditFlag" value="D"/>
> - <set field="debitEntry.organizationPartyId" from-field="invoice.partyId"/>
> <call-class-method method-name="getInvoiceUnattributedTaxTotal" class-name="org.ofbiz.accounting.invoice.InvoiceWorker"
> ret-field="taxAmount">
> <field field="invoice" type="GenericValue"/>
> </call-class-method>
> - <set field="debitEntry.origAmount" from-field="taxAmount"/>
> - <set field="debitEntry.origCurrencyUomId" from-field="invoice.currencyUomId"/>
> - <set field="acctgTransEntries[]" from-field="debitEntry" type="Object"/>
> -
> + <if>
> + <condition>
> + <and>
> + <if-compare field="taxAmount" operator="greater" value="0" type="BigDecimal"/>
> + </and>
> + </condition>
> + <then>
> + <clear-field field="debitEntry"/>
> + <make-value entity-name="AcctgTransEntry" value-field="debitEntry"/>
> + <set field="debitEntry.debitCreditFlag" value="D"/>
> + <set field="debitEntry.organizationPartyId" from-field="invoice.partyId"/>
> + <set field="debitEntry.origAmount" from-field="taxAmount"/>
> + <set field="debitEntry.origCurrencyUomId" from-field="invoice.currencyUomId"/>
> + <set field="acctgTransEntries[]" from-field="debitEntry" type="Object"/>
> + </then>
> + </if>
> <!-- Credit -->
> <make-value entity-name="AcctgTransEntry" value-field="creditEntry"/>
> <set field="creditEntry.debitCreditFlag" value="C"/>
>
> Propchange: ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Sep 28 07:48:09 2010
> @@ -1,3 +1,3 @@
> /ofbiz/branches/addbirt/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml:831210-885099,885686-886087
> /ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:921280-927264
> -/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-1001901
> +/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-1002043
>
> Propchange: ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Sep 28 07:48:09 2010
> @@ -1,3 +1,3 @@
> /incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:418499-490456
> /ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:921280-927264
> -/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-1001901
> +/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-1002043
>
> Propchange: ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Sep 28 07:48:09 2010
> @@ -1,3 +1,3 @@
> /ofbiz/branches/addbirt/applications/product/script/org/ofbiz/shipment/test/FacilityTests.xml:831210-885099,885686-886087
> /ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:921280-927264
> -/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-1001901
> +/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-1002043
>
> Propchange: ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Sep 28 07:48:09 2010
> @@ -1,3 +1,3 @@
> /ofbiz/branches/addbirt/applications/commonext/widget/HelpScreens.xml:831210-885099,885686-886087
> /ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264
> -/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-1001901
> +/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-1002043
>
> Propchange: ofbiz/branches/jquery/specialpurpose/ebaystore/lib/
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Sep 28 07:48:09 2010
> @@ -1,3 +1,3 @@
> /ofbiz/branches/addbirt/specialpurpose/ebay/lib:831210-885099,885686-886087
> /ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264
> -/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-1001901
> +/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-1002043
>
> Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Sep 28 07:48:09 2010
> @@ -1,3 +1,3 @@
> /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:418499-490456
> /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264
> -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-1001901
> +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-1002043
>
> Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Sep 28 07:48:09 2010
> @@ -1,3 +1,3 @@
> /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:418499-490456
> /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264
> -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-1001901
> +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-1002043
>
> Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Sep 28 07:48:09 2010
> @@ -1,3 +1,3 @@
> /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:418499-490456
> /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264
> -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-1001901
> +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-1002043
>
>